From 910950c3fc9671167345e9cc412155358207306d Mon Sep 17 00:00:00 2001
From: Armin Penz <Armin.Penz@student.uibk.ac.at>
Date: Tue, 11 Jun 2024 17:03:40 +0200
Subject: [PATCH] Now the output should be cleared.

---
 examples/shake_topology/gen_shake.ipynb | 58 +------------------------
 1 file changed, 1 insertion(+), 57 deletions(-)

diff --git a/examples/shake_topology/gen_shake.ipynb b/examples/shake_topology/gen_shake.ipynb
index d6ba7d6..ca9f234 100644
--- a/examples/shake_topology/gen_shake.ipynb
+++ b/examples/shake_topology/gen_shake.ipynb
@@ -11,26 +11,9 @@
   },
   {
    "cell_type": "code",
-<<<<<<< HEAD
    "execution_count": null,
    "metadata": {},
    "outputs": [],
-=======
-   "execution_count": 5,
-   "metadata": {},
-   "outputs": [
-    {
-     "data": {
-      "text/plain": [
-       "'1.1.2'"
-      ]
-     },
-     "execution_count": 5,
-     "metadata": {},
-     "output_type": "execute_result"
-    }
-   ],
->>>>>>> a6851a6a782ac0600bc129eeb786f2eff4e564e8
    "source": [
     "import PQAnalysis\n",
     "PQAnalysis._version.version"
@@ -47,40 +30,9 @@
   },
   {
    "cell_type": "code",
-<<<<<<< HEAD
    "execution_count": null,
    "metadata": {},
    "outputs": [],
-=======
-   "execution_count": 6,
-   "metadata": {},
-   "outputs": [
-    {
-     "data": {
-      "application/vnd.jupyter.widget-view+json": {
-       "model_id": "6772016017a94c9999aec38127c7a23e",
-       "version_major": 2,
-       "version_minor": 0
-      },
-      "text/plain": [
-       "  0%|          | 0/500 [00:00<?, ?it/s]"
-      ]
-     },
-     "metadata": {},
-     "output_type": "display_data"
-    },
-    {
-     "data": {
-      "text/plain": [
-       "Trajectory with 500 frames"
-      ]
-     },
-     "execution_count": 6,
-     "metadata": {},
-     "output_type": "execute_result"
-    }
-   ],
->>>>>>> a6851a6a782ac0600bc129eeb786f2eff4e564e8
    "source": [
     "from PQAnalysis.io import TrajectoryReader\n",
     "\n",
@@ -100,11 +52,7 @@
   },
   {
    "cell_type": "code",
-<<<<<<< HEAD
    "execution_count": null,
-=======
-   "execution_count": 7,
->>>>>>> a6851a6a782ac0600bc129eeb786f2eff4e564e8
    "metadata": {},
    "outputs": [],
    "source": [
@@ -129,11 +77,7 @@
   },
   {
    "cell_type": "code",
-<<<<<<< HEAD
    "execution_count": null,
-=======
-   "execution_count": 8,
->>>>>>> a6851a6a782ac0600bc129eeb786f2eff4e564e8
    "metadata": {},
    "outputs": [],
    "source": [
@@ -163,7 +107,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.12.3"
+   "version": "3.1.undefined"
   }
  },
  "nbformat": 4,