Home Explore Help
Sign In
ArseniyBorodin
/
GitTask
0
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

конфликт

Arseniy 6 months ago
parent
f9afdec1b1
commit
e512016ae0
1 changed files with 2 additions and 1 deletions
Unified View Show Diff Stats
  1. 2 1
      file.txt

+ 2 - 1
file.txt
View File 

@@ -1,4 +1,5 @@
 
 File
 
 File
 
 branch_1 changes
 
 branch_1 changes
 
 1
 
 1
 
-2
 
+2
 
+3