diff --git a/gui/dialogs/AIcarrier.xml b/gui/dialogs/AIcarrier.xml index 728871b8a..44d296537 100644 --- a/gui/dialogs/AIcarrier.xml +++ b/gui/dialogs/AIcarrier.xml @@ -1,7 +1,6 @@ -<<<<<<< HEAD AIcarrier false vbox @@ -243,238 +242,4 @@ true -======= - AIcarrier - false - vbox - - - - - - hbox - 1 - - - - - - 1 - - - - - - - - hbox - - 10 - - - - vbox - - - left - - /ai/models/carrier/controls/turn-to-launch-hdg - true - - dialog-apply - - - nasal - - - - - - left - - /ai/models/carrier/controls/turn-to-recovery-hdg - true - - dialog-apply - - - nasal - - - - - - left - - /ai/models/carrier/controls/turn-to-base-course - true - - dialog-apply - - - nasal - - - - - - left - - /ai/models/carrier/controls/elevators - - dialog-apply - - - nasal - - - - - - left - - /sim/current-view/lso-commentary - - dialog-apply - - - - - left - - /sim/current-view/deck-park - - dialog-apply - - - - - left - - /ai/models/carrier/controls/lighting/deck-lights - - dialog-apply - - - nasal - - - - - - left - - - - - left - 75 - 25 - /ai/models/carrier/controls/lighting/flood-lights-red-norm - - nasal - - - - - - - - true - - - - - - - hbox - 6 - - true - - - - - - - - - - - - true - - ->>>>>>> parent of 62a39cc... Bugfix