Commit ecf0a9e0 authored by Kair's avatar Kair

Merge branch 'dev' into 'feature/feature-of-kair'

# Conflicts:
#   Model/Truck.java
parents 162239e8 10870bce
public class Program {
public static void main(String[] args) {
//Почему пустой
//!!!
//This is my new dev branch
////
//коммент от Айбека
}
}
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment