fix more conflicts

omry · Jul 21, 2020 · 57e8079 · 57e8079
1 parent 8f52257
commit 57e8079
Showing 1 changed file with 5 additions and 4 deletions.
diff --git a/docs/notebook/Tutorial.ipynb b/docs/notebook/Tutorial.ipynb
@@ -688,7 +688,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 28,
+   "execution_count": 22,
    "metadata": {
     "pycharm": {
      "name": "#%%\n"
@@ -713,7 +713,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 29,
+   "execution_count": 23,
    "metadata": {
     "pycharm": {
      "name": "#%%\n"
@@ -847,7 +847,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 31,
+   "execution_count": 27,
    "metadata": {
     "pycharm": {
      "name": "#%%\n"
@@ -885,7 +885,8 @@
      "name": "stdout",
      "output_type": "stream",
      "text": [
-      "key: 1000\n",
+      "log:\n",
+      "  file: log.txt\n",
       "\n"
      ]
     }