fly/A320-family
1
0
Fork 0
Code Activity

Oops - didn't see merge conflict

Browse source
This commit is contained in:
legoboyvdlp R 2020-10-19 15:27:35 +01:00
parent 7fcfff4ad3
commit 3b0bf7f2b1
1 changed files with 0 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
A320-main.xml
View file

@ -4369,15 +4369,9 @@
<canvas_mcdu> <canvas_mcdu>
<file>Aircraft/A320-family/Models/Instruments/MCDU/MCDU.nas</file> <file>Aircraft/A320-family/Models/Instruments/MCDU/MCDU.nas</file>
</canvas_mcdu> </canvas_mcdu>
<<<<<<< Updated upstream
=======
<canvas_qnh>
<file>Aircraft/A320-family/Nasal/Displays/CanvasQNH.nas</file>
</canvas_qnh>
<canvas_qrh> <canvas_qrh>
<file>Aircraft/A320-family/Nasal/QRH/QRH.nas</file> <file>Aircraft/A320-family/Nasal/QRH/QRH.nas</file>
</canvas_qrh> </canvas_qrh>
>>>>>>> Stashed changes
<mcdu_scratchpad> <!-- delay till after canvas mcdu --> <mcdu_scratchpad> <!-- delay till after canvas mcdu -->
<file>Aircraft/A320-family/Nasal/FMGC/mcdu-messages.nas</file> <file>Aircraft/A320-family/Nasal/FMGC/mcdu-messages.nas</file>
</mcdu_scratchpad> </mcdu_scratchpad>