From 7a6e684581e967288f46435bd4108742c069a7b9 Mon Sep 17 00:00:00 2001
From: legoboyvdlp R <legoboyvdlp@gmail.com>
Date: Fri, 22 May 2020 21:00:11 +0100
Subject: [PATCH] Cleanup after merge

---
 A320-main.xml                 | 2 --
 Nasal/Libraries/libraries.nas | 4 ----
 2 files changed, 6 deletions(-)

diff --git a/A320-main.xml b/A320-main.xml
index 10da7a5e..d3a5c7e2 100644
--- a/A320-main.xml
+++ b/A320-main.xml
@@ -4115,10 +4115,8 @@
 			<file>Aircraft/A320-family/Nasal/Systems/Comm/HF.nas</file>
 			<file>Aircraft/A320-family/Nasal/Systems/brakes.nas</file>
 			<file>Aircraft/A320-family/Nasal/Systems/brakesystem.nas</file>
-			<file>Aircraft/A320-family/Nasal/Instruments/clock.nas</file>
 			<file>Aircraft/A320-family/Nasal/Systems/fire.nas</file>
 			<file>Aircraft/A320-family/Nasal/Systems/ground_services.nas</file>
-			<file>Aircraft/A320-family/Nasal/Systems/icing.nas</file>
 			<file>Aircraft/A320-family/Nasal/Systems/payload.nas</file>
 			<file>Aircraft/A320-family/Nasal/Panels/clock.nas</file>
 			<file>Aircraft/A320-family/Nasal/Systems/tyresmoke.nas</file>
diff --git a/Nasal/Libraries/libraries.nas b/Nasal/Libraries/libraries.nas
index 18290572..1bcd47c5 100644
--- a/Nasal/Libraries/libraries.nas
+++ b/Nasal/Libraries/libraries.nas
@@ -223,7 +223,6 @@ var systemsInit = func {
 	systems.APUController.init();
 	systems.autobrake_init();
 	systems.fire_init();
-	systems.icingInit();
 	fmgc.flightPlanController.reset();
 	fadec.FADEC.init();
 	fmgc.ITAF.init();
@@ -231,10 +230,7 @@ var systemsInit = func {
 	mcdu.MCDU_init(0);
 	mcdu.MCDU_init(1);
 	systemsLoop.start();
-<<<<<<< HEAD
 	effects.icingInit();
-=======
->>>>>>> dev
 	lightsLoop.start();
 	ecam.ECAM.init();
 	libraries.variousReset();