# Conflicts: # core/src/net/sf/openrocket/simulation/FlightDataType.java # core/src/net/sf/openrocket/unit/UnitGroup.java # swing/src/net/sf/openrocket/gui/dialogs/preferences/LaunchPreferencesPanel.java # swing/src/net/sf/openrocket/gui/dialogs/preferences/UnitsPreferencesPanel.java # swing/src/net/sf/openrocket/gui/simulation/SimulationConditionsPanel.java