From 3b0bf7f2b1a4b0c1d64aae83958be77b86eee0c6 Mon Sep 17 00:00:00 2001
From: legoboyvdlp R <legoboyvdlp@gmail.com>
Date: Mon, 19 Oct 2020 15:27:35 +0100
Subject: [PATCH] Oops - didn't see merge conflict

---
 A320-main.xml | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/A320-main.xml b/A320-main.xml
index 0e570c5d..41be07d7 100644
--- a/A320-main.xml
+++ b/A320-main.xml
@@ -4369,15 +4369,9 @@
 		<canvas_mcdu>
 			<file>Aircraft/A320-family/Models/Instruments/MCDU/MCDU.nas</file>
 		</canvas_mcdu>
-<<<<<<< Updated upstream
-=======
-		<canvas_qnh>
-			<file>Aircraft/A320-family/Nasal/Displays/CanvasQNH.nas</file>
-		</canvas_qnh>
 		<canvas_qrh>
 			<file>Aircraft/A320-family/Nasal/QRH/QRH.nas</file>
 		</canvas_qrh>
->>>>>>> Stashed changes
 		<mcdu_scratchpad> <!-- delay till after canvas mcdu -->
 			<file>Aircraft/A320-family/Nasal/FMGC/mcdu-messages.nas</file>
 		</mcdu_scratchpad>