Merge branch 'master' of github.com:kujirahand/book-mlearn-gyomu

kujirahand · Apr 5, 2023 · 2606bc2 · 2606bc2
2 parents c81b604 + d3693d2
commit 2606bc2
Showing 1 changed file with 0 additions and 9 deletions.
diff --git a/src/ch5/recog/CNN.ipynb b/src/ch5/recog/CNN.ipynb
@@ -146,11 +146,6 @@
      "output_type": "display_data"
     }
    ],
-=======
-   "execution_count": null,
-   "metadata": {},
-   "outputs": [],
->>>>>>> f2d660bb5e5fa34bc9fecc2fc378fa09168cf96c
    "source": [
     "import matplotlib.pyplot as plt\n",
     "import keras\n",
@@ -253,11 +248,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-<<<<<<< HEAD
    "version": "3.7.6"
-=======
-   "version": "3.7.4"
->>>>>>> f2d660bb5e5fa34bc9fecc2fc378fa09168cf96c
   }
  },
  "nbformat": 4,