Merge branch 'li-xinyang/master' into Note

Conflicts: Progress.md README.md WebCreation/WebCreation.md
EkoWang · Jun 16, 2015 · e46f799 · e46f799
2 parents b0b1cbc + e8861ee
commit e46f799
Show file tree

Hide file tree

Showing 3 changed files with 45 additions and 0 deletions.
diff --git a/Progress.md b/Progress.md
@@ -3,19 +3,39 @@
 **Table of Contents**  *generated with [DocToc](https://github.com/thlorenz/doctoc)*
 
 <<<<<<< HEAD
+<<<<<<< HEAD
+=======
+- [Javascript程序设计 20/23](#javascript%E7%A8%8B%E5%BA%8F%E8%AE%BE%E8%AE%A1-2023)
+=======
+<<<<<<< HEAD
+>>>>>>> li-xinyang/master
 - [Javascript程序设计 16/23](#javascript%E7%A8%8B%E5%BA%8F%E8%AE%BE%E8%AE%A1-1623)
 =======
 - [Javascript程序设计 20/23](#javascript%E7%A8%8B%E5%BA%8F%E8%AE%BE%E8%AE%A1-2023)
 >>>>>>> li-xinyang/master
+<<<<<<< HEAD
+=======
+>>>>>>> Note
+>>>>>>> li-xinyang/master
 - [页面制作 39/41](#%E9%A1%B5%E9%9D%A2%E5%88%B6%E4%BD%9C-3941)
 
 <!-- END doctoc generated TOC please keep comment here to allow auto update -->
 
 <<<<<<< HEAD
+<<<<<<< HEAD
+=======
+# Javascript程序设计 20/23
+=======
+<<<<<<< HEAD
+>>>>>>> li-xinyang/master
 # Javascript程序设计 16/23
 =======
 # Javascript程序设计 20/23
 >>>>>>> li-xinyang/master
+<<<<<<< HEAD
+=======
+>>>>>>> Note
+>>>>>>> li-xinyang/master
 
 |章节|课题|状态|时间戳|
 |----|----|----|------|

diff --git a/README.md b/README.md
@@ -20,10 +20,20 @@
 ### Javascript 程序设计
 
 <<<<<<< HEAD
+<<<<<<< HEAD
+=======
+![](http://progressed.io/bar/87?title=Progress) [详情](JavascriptDesignPattern/JavascriptDesignPattern.md)
+=======
+<<<<<<< HEAD
+>>>>>>> li-xinyang/master
 ![](http://progressed.io/bar/70?title=Progress) [详情](JavascriptDesignPattern/JavascriptDesignPattern.md)
 =======
 ![](http://progressed.io/bar/87?title=Progress) [详情](JavascriptDesignPattern/JavascriptDesignPattern.md)
 >>>>>>> li-xinyang/master
+<<<<<<< HEAD
+=======
+>>>>>>> Note
+>>>>>>> li-xinyang/master
 
 ### 页面制作
 

diff --git a/WebCreation/WebCreation.md b/WebCreation/WebCreation.md
@@ -53,9 +53,17 @@ Web 1.0 -> Web 2.0（基于 Ajax） -> Web 3.0 （基于 HTML5）
 
 ## CSS
 
+<<<<<<< HEAD
 <<<<<<< HEAD
 [阅读更多](WebCreation-CSS.md)
 =======
+=======
+=======
+<<<<<<< HEAD
+[阅读更多](WebCreation-CSS.md)
+=======
+>>>>>>> Note
+>>>>>>> li-xinyang/master
 [阅读第一部分](WebCreation-CSS-0.md)
 
 - 简介
@@ -73,6 +81,13 @@ Web 1.0 -> Web 2.0（基于 Ajax） -> Web 3.0 （基于 HTML5）
 - 布局
 - 变形
 - 动画
+<<<<<<< HEAD
+>>>>>>> li-xinyang/master
+=======
+<<<<<<< HEAD
+=======
+>>>>>>> li-xinyang/master
+>>>>>>> Note
 >>>>>>> li-xinyang/master
 
 <a rel="license" href="http://creativecommons.org/licenses/by-nc-sa/4.0/"><img alt="Creative Commons License" style="border-width:0" src="https://i.creativecommons.org/l/by-nc-sa/4.0/80x15.png" /></a><br />This work by <a xmlns:cc="http://creativecommons.org/ns#" href="li-xinyang.com" property="cc:attributionName" rel="cc:attributionURL">Li Xinyang</a> is licensed under a <a rel="license" href="http://creativecommons.org/licenses/by-nc-sa/4.0/">Creative Commons Attribution-NonCommercial-ShareAlike 4.0 International License</a>.