saddd

zzlinux · Mar 27, 2016 · 7eba420 · 7eba420
2 parents c747675 + e37e0de
commit 7eba420
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/git_learn.txt b/git_learn.txt
@@ -13,7 +13,11 @@
 <<<<<<< HEAD
 13.git merge --no-ff -m "merge with no-ff"
 14.conflict fixed
+<<<<<<< HEAD
 =======
 13.git merge --no-ff -m "merge with no-ff"
 14.conflict fixed
 >>>>>>> dev
+=======
+15.hope conflice fixed
+>>>>>>> dev