# Conflicts: # ProjectAirbus/src/DirectionType.java # ProjectAirbus/src/DrawningAirbus.java # ProjectAirbus/src/DrawningAirbusPortholes.java # ProjectAirbus/src/EntityAirbus.java # ProjectAirbus/src/FormAirbus.form # ProjectAirbus/src/FormAirbus.java # ProjectAirbus/src/Main.java # ProjectAirbus/src/PortholesEnum.java