Git

최원섭
Commit 813e53368013cbc8f159f6aaa24c1a9219477287 813e5336 2 parents 627357ed ca841983
Showing 4 changed files with 16 additions and 0 deletions
1.txt
2.txt
5.txt
6.txt
--- a/1.txt
View file @813e533
+++ b/1.txt
View file @813e533
+ <<<<<<< HEAD
 qwerqsdfgasdkfjasdfq:qsdasdkgjasfdgjq:1
+ =======
+ qwerqsdfgasdkfjasdfq:q:1
+ >>>>>>> ca841983c669b5b9dba0655201a120e1983b82c0
--- a/2.txt
View file @813e533
+++ b/2.txt
View file @813e533
 2.txt
+ <<<<<<< HEAD
 asdkfadsjasdkfjadksfj1fskfdgjasgj
+ =======
+ asdkfadsjasdkfjadksfj1f
+ >>>>>>> ca841983c669b5b9dba0655201a120e1983b82c0
--- a/5.txt
View file @813e533
+++ b/5.txt
View file @813e533
+ <<<<<<< HEAD
 sdkfjadskfj`:wq`:waskdfjaksdjgfq
+ =======
+ sdkfjadskfj`:wq`:wq
+ >>>>>>> ca841983c669b5b9dba0655201a120e1983b82c0
--- a/6.txt
View file @813e533
+++ b/6.txt
View file @813e533
+ <<<<<<< HEAD
 asdkfjasdfsdkjaksdjgj
+ =======
+ asdkfjasdfj
+ >>>>>>> ca841983c669b5b9dba0655201a120e1983b82c0