From 80ab32976124c8ac3b108e00e5a0e2c26d0db2de Mon Sep 17 00:00:00 2001
From: Josh Davidson <joshuadavidson2000@gmail.com>
Date: Tue, 1 Dec 2020 11:52:16 -0500
Subject: [PATCH] GIT: Fix conflict

---
 AircraftConfig/fbw.xml | 4 ++--
 Systems/a320-fcs.xml   | 5 -----
 2 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/AircraftConfig/fbw.xml b/AircraftConfig/fbw.xml
index d5904b08..a6d27ca3 100644
--- a/AircraftConfig/fbw.xml
+++ b/AircraftConfig/fbw.xml
@@ -198,7 +198,7 @@
 					<vertical>true</vertical>
 					<property>/fdm/jsbsim/hydraulics/elevator-l/final-deg</property>
 					<min>-30</min>
-					<max>17</max>
+					<max>15</max>
 					<step>0.003</step>
 					<live>true</live>
 				</slider>
@@ -232,7 +232,7 @@
 					<vertical>true</vertical>
 					<property>/fdm/jsbsim/hydraulics/elevator-r/final-deg</property>
 					<min>-30</min>
-					<max>17</max>
+					<max>15</max>
 					<step>0.003</step>
 					<live>true</live>
 				</slider>
diff --git a/Systems/a320-fcs.xml b/Systems/a320-fcs.xml
index e6f91f6b..93036bef 100644
--- a/Systems/a320-fcs.xml
+++ b/Systems/a320-fcs.xml
@@ -370,16 +370,11 @@
 	
 	<channel name="Pitch Trim">
 		
-<<<<<<< HEAD
 		<switch name="hydraulics/stabilizer/rate">
-			<default value="0.125"/>
-=======
-		<switch name="hydraulics/elevator-trim/rate">
 			<default value="0"/> <!-- only mechanical input to hyd actuator. So it does need hydraulic power -->
 			<test value="0">
 				/systems/failures/fctl/ths-jam eq 1
 			</test>
->>>>>>> 3D
 			<test logic="OR" value="0.25">
 				/systems/hydraulic/yellow-psi ge 1500
 				/systems/hydraulic/green-psi ge 1500