Resolve merge conflict

climlab · Feb 4, 2015 · 39a5a02 · 39a5a02
2 parents f68a975 + 83de143
commit 39a5a02
Showing 1 changed file with 29 additions and 4 deletions.
diff --git a/courseware/Introducing the Column Model.ipynb b/courseware/Introducing the Column Model.ipynb
@@ -1,7 +1,7 @@
 {
  "metadata": {
   "name": "",
-  "signature": "sha256:e1952616d5b6c61a952dfa723c9e74922cb8a9033cbddcd34070df675baa9359"
+  "signature": "sha256:691ccae06f2e23984af9f03811134397f09d9fe16458c90cef4d5485a3e6a478"
  },
  "nbformat": 3,
  "nbformat_minor": 0,
@@ -122,7 +122,18 @@
      ],
      "language": "python",
      "metadata": {},
-     "outputs": [],
+     "outputs": [
+      {
+       "ename": "ImportError",
+       "evalue": "No module named ColumnModel",
+       "output_type": "pyerr",
+       "traceback": [
+        "\u001b[0;31m---------------------------------------------------------------------------\u001b[0m\n\u001b[0;31mImportError\u001b[0m                               Traceback (most recent call last)",
+        "\u001b[0;32m<ipython-input-2-5933880538c1>\u001b[0m in \u001b[0;36m<module>\u001b[0;34m()\u001b[0m\n\u001b[0;32m----> 1\u001b[0;31m \u001b[0;32mimport\u001b[0m \u001b[0mColumnModel\u001b[0m\u001b[0;34m\u001b[0m\u001b[0m\n\u001b[0m",
+        "\u001b[0;31mImportError\u001b[0m: No module named ColumnModel"
+       ]
+      }
+     ],
      "prompt_number": 2
     },
     {
@@ -650,7 +661,14 @@
        "stream": "stdout",
        "text": [
         "Integrating for 109 steps or 0.3 years.\n",
-        "Total elapsed time is 0.355928203258 years.\n",
+        "Total elapsed time is 0.355928203258 years."
+       ]
+      },
+      {
+       "output_type": "stream",
+       "stream": "stdout",
+       "text": [
+        "\n",
         "287.809196108\n"
        ]
       }
@@ -685,7 +703,14 @@
        "stream": "stdout",
        "text": [
         "Integrating for 109 steps or 0.3 years.\n",
-        "Total elapsed time is 0.654360312144 years.\n",
+        "Total elapsed time is 0.654360312144 years."
+       ]
+      },
+      {
+       "output_type": "stream",
+       "stream": "stdout",
+       "text": [
+        "\n",
         "287.846465832\n"
        ]
       }