Resolve conflict

10870bce · Kair · 5960b65d · dc0fc863 · 10870bce
Commit 10870bce authored Nov 20, 2024 by Kair
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

Program.java Program.java +2 -1

No files found.
--- a/Program.java
+++ b/Program.java
@@ -4,5 +4,6 @@ public class Program {
        //!!!
        //This is my new dev branch
        ////
-    }    
+        //коммент от Айбека
+    }
 }
\ No newline at end of file