Resolve problem of cannot open simple trading strategy

clojure-finance · Mar 11, 2021 · 8cae4ad · 8cae4ad
1 parent 7dde463
commit 8cae4ad
Showing 1 changed file with 4 additions and 28 deletions.
diff --git a/examples/Simple trading strategy.ipynb b/examples/Simple trading strategy.ipynb
@@ -148,11 +148,7 @@
   },
   {
    "cell_type": "code",
-<<<<<<< HEAD
-   "execution_count": 2,
-=======
    "execution_count": 6,
->>>>>>> 708165faca4eb2fea276c8148bb43eb33c561ce9
    "metadata": {},
    "outputs": [],
    "source": [
@@ -199,11 +195,7 @@
   },
   {
    "cell_type": "code",
-<<<<<<< HEAD
-   "execution_count": 3,
-=======
    "execution_count": 8,
->>>>>>> 708165faca4eb2fea276c8148bb43eb33c561ce9
    "metadata": {},
    "outputs": [],
    "source": [
@@ -213,7 +205,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 4,
+   "execution_count": 5,
    "metadata": {},
    "outputs": [
     {
@@ -222,7 +214,7 @@
        "(\"AAPL\" \"F\" \"IBM\")"
       ]
      },
-     "execution_count": 4,
+     "execution_count": 5,
      "metadata": {},
      "output_type": "execute_result"
     }
@@ -255,11 +247,7 @@
   },
   {
    "cell_type": "code",
-<<<<<<< HEAD
-   "execution_count": 5,
-=======
    "execution_count": 10,
->>>>>>> 708165faca4eb2fea276c8148bb43eb33c561ce9
    "metadata": {
     "scrolled": false
    },
@@ -305,11 +293,7 @@
        "nil"
       ]
      },
-<<<<<<< HEAD
-     "execution_count": 5,
-=======
      "execution_count": 10,
->>>>>>> 708165faca4eb2fea276c8148bb43eb33c561ce9
      "metadata": {},
      "output_type": "execute_result"
     }
@@ -435,11 +419,7 @@
   },
   {
    "cell_type": "code",
-<<<<<<< HEAD
-   "execution_count": 6,
-=======
    "execution_count": 5,
->>>>>>> 708165faca4eb2fea276c8148bb43eb33c561ce9
    "metadata": {},
    "outputs": [
     {
@@ -459,11 +439,7 @@
        "nil"
       ]
      },
-<<<<<<< HEAD
-     "execution_count": 6,
-=======
      "execution_count": 5,
->>>>>>> 708165faca4eb2fea276c8148bb43eb33c561ce9
      "metadata": {},
      "output_type": "execute_result"
     }
@@ -481,7 +457,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 7,
+   "execution_count": 8,
    "metadata": {},
    "outputs": [
     {
@@ -500,7 +476,7 @@
        "nil"
       ]
      },
-     "execution_count": 7,
+     "execution_count": 8,
      "metadata": {},
      "output_type": "execute_result"
     }