3 changed files with 5 additions and 2 deletions
--- a/README.md
+++ b/README.md
@ -1,2 +0,0 @@
-# cdk1
-
--- a/test.txt
+++ b/test.txt
@ -0,0 +1,5 @@
+<<<<<<< HEAD
+10086
+=======
+111
+>>>>>>> dev
--- a/text1.2.txt
+++ b/text1.2.txt