第一次提交

Merge branch 'master' of https://bdgit.educoder.net/pah3i8rke/Mlc_GTI
2 changed files with 18 additions and 0 deletions
--- a/README.md
+++ b/README.md
@ -1,2 +1,14 @@
 # Mlc_GTI

+<<<<<<< HEAD
+笨蛋
+=======
+<<<<<<< HEAD
+<<<<<<< HEAD
+=======
+笨蛋
+>>>>>>> 1998ca5083675383f6d79e218d868b996a0658b7
+=======
+笨蛋
+>>>>>>> 1998ca5083675383f6d79e218d868b996a0658b7
+>>>>>>> e4dad2130fac6e6dedfb93e05d253ddde6059ddd
--- a/mlc_gti/README.md
+++ b/mlc_gti/README.md
@ -0,0 +1,6 @@
+聪明蛋
+000
+111
+1111
+2222
+1111
Author	SHA1	Message	Date
毛良成	bb3c387c26	第一次提交	10 months ago
毛良成	4865202be8	Merge branch 'master' of https://bdgit.educoder.net/pah3i8rke/Mlc_GTI	10 months ago
毛良成	7ebaf2c0d5	Merge branch 'master' of https://bdgit.educoder.net/pah3i8rke/Mlc_GTI	10 months ago
毛良成	5814643b1d	Merge branch 'master' of https://bdgit.educoder.net/pah3i8rke/Mlc_GTI	10 months ago
毛良成	7d785b6b4c	Merge branch 'Mlc_branch' of https://bdgit.educoder.net/pah3i8rke/Mlc_GTI # Conflicts: # README.md	10 months ago
毛良成	275b706597	Merge branch 'Mlc_branch' of https://bdgit.educoder.net/pah3i8rke/Mlc_GTI # Conflicts: # README.md	10 months ago
pah3i8rke	3fa3dd7f13	Update README.md	10 months ago
毛良成	e4dad2130f	Merge branch 'Mlc_branch' of https://bdgit.educoder.net/pah3i8rke/Mlc_GTI	10 months ago
毛良成	c7ecb0fd37	Merge branch 'Mlc_branch' of https://bdgit.educoder.net/pah3i8rke/Mlc_GTI	10 months ago
毛良成	1a9aff7093	Merge branch 'Mlc_branch' of https://bdgit.educoder.net/pah3i8rke/Mlc_GTI	10 months ago
毛良成	75a2a9a09a	Merge branch 'Mlc_branch' of https://bdgit.educoder.net/pah3i8rke/Mlc_GTI # Conflicts: # README.md	10 months ago
毛良成	3a9c4a3dd9	Merge branch 'Mlc_branch' of https://bdgit.educoder.net/pah3i8rke/Mlc_GTI # Conflicts: # README.md	10 months ago
pah3i8rke	38abf2d000	Initial commit	10 months ago
pah3i8rke	1998ca5083	Update README.md	11 months ago