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