Merge bravo with master

DarVeter24 · Oct 15, 2021 · 23799c5 · 23799c5
2 parents a9d77e7 + dde2f67
commit 23799c5
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/file2_master b/file2_master
@@ -1,3 +1,8 @@
 Text1
+<<<<<<< HEAD
 Text2
 Text3
+=======
+Bravo Text1 write
+Bravo Text2 write
+>>>>>>> bravo