Resolve conflict

e03f432a · Kair · 029cbca8 · efc7e2ab · e03f432a
Commit e03f432a authored Nov 20, 2024 by Kair
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 0 deletions

Program.java Program.java +4 -0

No files found.
--- a/Program.java
+++ b/Program.java
 public class Program {
    public static void main(String[] args) {
+<<<<<<< HEAD
        //Почему пустой
+=======
+        //!!!
+>>>>>>> efc7e2ab063cafc5d563c54bd4113ab8148a7973
    }
    
 }
\ No newline at end of file