# Conflicts: # swing/src/net/sf/openrocket/gui/main/BasicFrame.java # swing/src/net/sf/openrocket/gui/main/FlightConfigurationPanel.java
# Conflicts: # swing/src/net/sf/openrocket/gui/main/BasicFrame.java # swing/src/net/sf/openrocket/gui/main/FlightConfigurationPanel.java