添加了静态文件信信息

lijin-THU · lijin-THU · commit 4cdc0ae70884 · 2016-01-06T13:18:33.000+08:00
Former-commit-id: 30ae40d
diff --git a/index.ipynb b/index.ipynb
@@ -65,6 +65,7 @@
    "source": [
     "----\n",
     "\n",
+<<<<<<< HEAD
     "## 目录"
    ]
   },
@@ -77,6 +78,11 @@
     "可以在 static files 文件夹查看 [HTML 文件](static files/html/README.md)。\n",
     "\n",
     "---"
+=======
+    "## 目录\n",
+    "\n",
+    "可以在[nbviewer](http://nbviewer.ipython.org/github/lijin-THU/python-tutorial/blob/master/index.ipynb)中查看该笔记。"
+>>>>>>> 9dbc2e9cdb91aacb17cdf700f0639c3488b4dd7b
    ]
   },
   {

Original file line number	Diff line number	Diff line change
`@@ -65,6 +65,7 @@`
`65`	`65`	`"source": [`
`66`	`66`	`"----\n",`
`67`	`67`	`"\n",`
	`68`	`+<<<<<<< HEAD`
`68`	`69`	`"## 目录"`
`69`	`70`	`]`
`70`	`71`	`},`
`@@ -77,6 +78,11 @@`
`77`	`78`	`"可以在 static files 文件夹查看 [HTML 文件](static files/html/README.md)。\n",`
`78`	`79`	`"\n",`
`79`	`80`	`"---"`
	`81`	`+=======`
	`82`	`+ "## 目录\n",`
	`83`	`+ "\n",`
	`84`	`+ "可以在[nbviewer](http://nbviewer.ipython.org/github/lijin-THU/python-tutorial/blob/master/index.ipynb)中查看该笔记。"`
	`85`	`+>>>>>>> 9dbc2e9cdb91aacb17cdf700f0639c3488b4dd7b`
`80`	`86`	`]`
`81`	`87`	`},`
`82`	`88`	`{`