Merge branch 'dev' into Aibek

17fefe2f · Aibek · ccc1ce37 · 10870bce · 17fefe2f · 17fefe2f
Commit 17fefe2f authored Nov 20, 2024 by Aibek 👁
Hide whitespace changes
Inline Side-by-side

Showing with 7 additions and 2 deletions

Truck.java Model/Truck.java +3 -1

Program.java Program.java +4 -1

No files found.
--- a/Model/Truck.java
+++ b/Model/Truck.java
@@ -3,6 +3,8 @@ package Model;
 public class Truck {
    // Comment
    public Truck() {
-     //Dev branch   
+     //Dev Kair  
+     //20/11/2024
+     //1111111
    }
 }
--- a/Program.java
+++ b/Program.java
 public class Program {
    public static void main(String[] args) {
+        //Почему пустой
+        //!!!
+        //This is my new dev branch
+        ////
        //коммент от Айбека
        //Ок ок ок
    }
-    
 }
\ No newline at end of file