Merge branch 'master' into 'master'

new file: chapters/.gitignore See merge request csdn/intro-ossd!24

Merge branch 'master' into 'master'
new file: chapters/.gitignore See merge request csdn/intro-ossd!24
4749bf9d · SoftwareTeacher · fc51a05f · ac0d437d · 4749bf9d · 4749bf9d
隐藏空白更改
内联并排

Showing with 2 addition and 1 deletion

chapters/.gitignore chapters/.gitignore +2 -0

chapters/1.md chapters/1.md +0 -1

未找到文件。
--- a/chapters/.gitignore
+++ b/chapters/.gitignore
+.DS_Store
+
--- a/chapters/1.md
+++ b/chapters/1.md
@@ -38,7 +38,6 @@

 同学们，开始实践吧！

-
 ## 开源的发展历史
 （1）通过对比闭源软件，介绍开源软件基本概念、发展历史、国外开源软件发展现状（1学时）；