3 Commits d7b35b69a2 ... ee27a573e3

Author SHA1 Message Date
  Arseniy ee27a573e3 Merge remote-tracking branch 'origin/main' 5 months ago
  Arseniy cf80004074 4 5 months ago
  Arseniy e512016ae0 конфликт 6 months ago
1 changed files with 1 additions and 2 deletions
  1. 1 2
      file.txt

+ 1 - 2
file.txt

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