Commits · dev · AJ-9 / KairDedmo

20 Nov, 2024 17 commits
- Merge remote-tracking branch 'origin/dev' into dev · 74583af9
  Aibek authored Nov 20, 2024
  
  74583af9
- Merge branch 'feature/feature-of-kair' into 'dev' · ae1c1677
  Kair authored Nov 20, 2024
```
Feature/feature of kair

See merge request !2
```
  ae1c1677
- Merge branch 'dev' into 'feature/feature-of-kair' · ecf0a9e0
  Kair authored Nov 20, 2024
```
# Conflicts:
#   Model/Truck.java
```
  ecf0a9e0
- added note · bb4a2236
  Aibek authored Nov 20, 2024
  
  bb4a2236
- Merge branch 'dev' into Aibek · 17fefe2f
  Aibek authored Nov 20, 2024
  
  17fefe2f
- Resolve conflict · 10870bce
  Kair authored Nov 20, 2024
  
  10870bce
- make some changes · 162239e8
  Kaledin Evgenii authored Nov 20, 2024
  
  162239e8
- dev · 5960b65d
  Kair authored Nov 20, 2024
  
  5960b65d
- added note2 · ccc1ce37
  Aibek authored Nov 20, 2024
  
  ccc1ce37
- Update Truck.java · ff502efd
  Kair authored Nov 20, 2024
  
  ff502efd
- Update Truck.java · eda0399d
  Kair authored Nov 20, 2024
  
  eda0399d
- Resolve conflict · 6db3c4e9
  Kair authored Nov 20, 2024
  
  6db3c4e9
- Resolve conflict · e03f432a
  Kair authored Nov 20, 2024
  
  e03f432a
- make class hello in model · af8588ec
  Kaledin Evgenii authored Nov 20, 2024
  
  af8588ec
- Update Program.java · efc7e2ab
  Kair authored Nov 20, 2024
  
  efc7e2ab
- added note · dc0fc863
  Aibek authored Nov 20, 2024
  
  dc0fc863
- comment · 029cbca8
  Kair authored Nov 20, 2024
  
  029cbca8
08 Jul, 2024 6 commits
- new branch · a53281f7
  Kair authored Jul 08, 2024
  
  a53281f7
- Changed truck model · 71891ec9
  Kair authored Jul 08, 2024
  
  71891ec9
- Added new truck model · 7037b18e
  Kair authored Jul 08, 2024
  
  7037b18e
- added the main method · 37e9b53b
  Kair authored Jul 08, 2024
  
  37e9b53b
- new file. new Attempt · a593aa4a
  Kair authored Jul 08, 2024
  
  a593aa4a
- new file · c4d6b640
  Kair authored Jul 08, 2024
  
  c4d6b640