Skip to content

Commit 8cae4ad

Browse files
committed
Resolve problem of cannot open simple trading strategy
1 parent 7dde463 commit 8cae4ad

File tree

1 file changed

+4
-28
lines changed

1 file changed

+4
-28
lines changed

examples/Simple trading strategy.ipynb

Lines changed: 4 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -148,11 +148,7 @@
148148
},
149149
{
150150
"cell_type": "code",
151-
<<<<<<< HEAD
152-
"execution_count": 2,
153-
=======
154151
"execution_count": 6,
155-
>>>>>>> 708165faca4eb2fea276c8148bb43eb33c561ce9
156152
"metadata": {},
157153
"outputs": [],
158154
"source": [
@@ -199,11 +195,7 @@
199195
},
200196
{
201197
"cell_type": "code",
202-
<<<<<<< HEAD
203-
"execution_count": 3,
204-
=======
205198
"execution_count": 8,
206-
>>>>>>> 708165faca4eb2fea276c8148bb43eb33c561ce9
207199
"metadata": {},
208200
"outputs": [],
209201
"source": [
@@ -213,7 +205,7 @@
213205
},
214206
{
215207
"cell_type": "code",
216-
"execution_count": 4,
208+
"execution_count": 5,
217209
"metadata": {},
218210
"outputs": [
219211
{
@@ -222,7 +214,7 @@
222214
"(\"AAPL\" \"F\" \"IBM\")"
223215
]
224216
},
225-
"execution_count": 4,
217+
"execution_count": 5,
226218
"metadata": {},
227219
"output_type": "execute_result"
228220
}
@@ -255,11 +247,7 @@
255247
},
256248
{
257249
"cell_type": "code",
258-
<<<<<<< HEAD
259-
"execution_count": 5,
260-
=======
261250
"execution_count": 10,
262-
>>>>>>> 708165faca4eb2fea276c8148bb43eb33c561ce9
263251
"metadata": {
264252
"scrolled": false
265253
},
@@ -305,11 +293,7 @@
305293
"nil"
306294
]
307295
},
308-
<<<<<<< HEAD
309-
"execution_count": 5,
310-
=======
311296
"execution_count": 10,
312-
>>>>>>> 708165faca4eb2fea276c8148bb43eb33c561ce9
313297
"metadata": {},
314298
"output_type": "execute_result"
315299
}
@@ -435,11 +419,7 @@
435419
},
436420
{
437421
"cell_type": "code",
438-
<<<<<<< HEAD
439-
"execution_count": 6,
440-
=======
441422
"execution_count": 5,
442-
>>>>>>> 708165faca4eb2fea276c8148bb43eb33c561ce9
443423
"metadata": {},
444424
"outputs": [
445425
{
@@ -459,11 +439,7 @@
459439
"nil"
460440
]
461441
},
462-
<<<<<<< HEAD
463-
"execution_count": 6,
464-
=======
465442
"execution_count": 5,
466-
>>>>>>> 708165faca4eb2fea276c8148bb43eb33c561ce9
467443
"metadata": {},
468444
"output_type": "execute_result"
469445
}
@@ -481,7 +457,7 @@
481457
},
482458
{
483459
"cell_type": "code",
484-
"execution_count": 7,
460+
"execution_count": 8,
485461
"metadata": {},
486462
"outputs": [
487463
{
@@ -500,7 +476,7 @@
500476
"nil"
501477
]
502478
},
503-
"execution_count": 7,
479+
"execution_count": 8,
504480
"metadata": {},
505481
"output_type": "execute_result"
506482
}

0 commit comments

Comments
 (0)