-
Andrei Zhikulin authored
# Conflicts: # server/src/main/java/server/dto/FlightDto.java # server/src/main/java/server/dto/PassengerDto.java # server/src/main/java/server/model/PassengerEntity.java
28c7eb49
# Conflicts: # server/src/main/java/server/dto/FlightDto.java # server/src/main/java/server/dto/PassengerDto.java # server/src/main/java/server/model/PassengerEntity.java