Fixing conflicts

This commit is contained in:
Victor Felder
2015-11-13 18:48:01 +01:00
2 changed files with 7 additions and 0 deletions

View File

@ -75,6 +75,7 @@
* [慕课网](http://www.imooc.com/course/list) (丰富的移动端开发、php开发、web前端、html5教程以及css3视频教程等课程资源)
* [极客学院](http://www.jikexueyuan.com/)
* [51CTO学院](http://edu.51cto.com/)
* [计蒜客](http://www.jisuanke.com/)
### 软件开发方法