merge conflicts

jhconning · Jan 27, 2016 · 0d91775 · 0d91775
2 parents e74ec02 + 7b0a0c2
commit 0d91775
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/index.rst b/index.rst
@@ -1,6 +1,7 @@
 Development II seminar (Spring 2016)
 =======================================
 Notes and support materials for The Graduate
+
 Center's `Economics 842:`_ taught by Jonathan Conning
 
 
@@ -15,4 +16,5 @@ the sections of the documents that follow are *very* preliminar.
    notebooks/Harris_Todaro
    notebooks/dataAPIs
 
+
 .. _Economics 842: http://www.gc.cuny.edu/Page-Elements/Academics-Research-Centers-Initiatives/Doctoral-Programs/Economics/Courses
diff --git a/notebooks/Harris_Todaro.ipynb b/notebooks/Harris_Todaro.ipynb
@@ -62,7 +62,7 @@
    "source": [
     "For given wage $w$ labor demand in manufacturing is:\n",
     "\n",
-    "$$L_m(w) = \\right \\frac{A_m (1-\\alpha) \\bar K}{w/P_m} $$\n",
+    "$$L_m(w) = \\left [ { \\frac{A_m (1-\\alpha) \\bar K}{w/P_m} } \\right ]^\\frac{1}{\\alpha} $$\n",
     "\n",
     "\n",
     "\n",
@@ -751,7 +751,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.5.1"
+   "version": "3.4.4"
   }
  },
  "nbformat": 4,