Skip to content

Commit c8d9a02

Browse files
BigBenGaomichaelliao
BigBenGao
authored and
michaelliao
committed
test pull requests (#1775)
* Revert "add xiaoleon.txt" * 感谢老师,试试pull (#1422) * 感谢老师!pull练习! (#1616) * Create dengjunfen (#1633) * Create 阿斯顿是大神阿斯顿 (#1704) 大三大四的 * test * test pull requests * add some file * test pull requests
1 parent bf53d0f commit c8d9a02

1,923 files changed

Lines changed: 6358 additions & 2 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎$$$$$$$$.txt‎

100644100755
File mode changed.

‎- -Mr. liao 您好，兰林书- -.txt‎

100644100755
File mode changed.

‎- 真的很感谢~.txt‎

100644100755
File mode changed.

‎- 通俗易懂，言辞幽默，非常感谢 -‎

100644100755
File mode changed.

‎.000‎

100644100755
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,10 @@
22

33
版本库HEAD表示当前版本，上一个版本HEAD^，上上一个版本HEAD^^.......
44

5+
<<<<<<< HEAD
56

7+
=======
8+
>>>>>>> 2e3ba62650634f2f0a08f9d964b88c846a00c991
69
配置本机git
710
git config --global user.name "abcd"
811
git config --global user.email abcd@efgh.com

‎.3qTeacherLiao.txt‎

100644100755
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
11
LinWM：
22
修复一个BUG：廖老师好帅！！！
3+
<<<<<<< HEAD
34
又发现一个BUG：廖老师好帅不是BUG，是既定事实，^_^
5+
=======
6+
7+
又发现一个BUG：廖老师好帅不是BUG，是既定事实，^_^
8+
>>>>>>> 2e3ba62650634f2f0a08f9d964b88c846a00c991

‎.gitignore‎

100644100755
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,12 @@
11
mydb.txt
2+
<<<<<<< HEAD
23
*.ignore
34
*.so
45
*.class
56
#windows
67
*.ini
78
*.Thumbs.db
9+
=======
10+
11+
*.so
12+
>>>>>>> 2e3ba62650634f2f0a08f9d964b88c846a00c991

‎.idea/modules.xml‎

100644100755
File mode changed.

‎.idea/vcs.xml‎

100644100755
File mode changed.

‎.project‎

100644100755
File mode changed.

0 commit comments

Comments
 (0)