Resolve conflict

6db3c4e9 · Kair · e03f432a · 6db3c4e9
Commit 6db3c4e9 authored Nov 20, 2024 by Kair
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 3 deletions

Program.java Program.java +0 -3

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