From e3d348a0fa026c0816b0ee8980a706b3f96d4523 Mon Sep 17 00:00:00 2001
From: Christopher Young <cyoung@gmail.com>
Date: Thu, 14 Jul 2016 15:50:07 -0400
Subject: [PATCH] Resolve conflicts.

---
 Makefile                 | 6 ------
 image/mkimg.sh           | 5 ++---
 selfupdate/makeupdate.sh | 3 ---
 3 files changed, 2 insertions(+), 12 deletions(-)

diff --git a/Makefile b/Makefile
index 48f498d4..cfa218fb 100644
--- a/Makefile
+++ b/Makefile
@@ -39,19 +39,13 @@ install:
 	cp -f gen_gdl90 /usr/bin/gen_gdl90
 	chmod 755 /usr/bin/gen_gdl90
 	cp image/10-stratux.rules /etc/udev/rules.d/10-stratux.rules
-<<<<<<< HEAD
 	cp image/99-uavionix.rules /etc/udev/rules.d/99-uavionix.rules
-	chmod 755 /etc/init.d/stratux
-	ln -sf /etc/init.d/stratux /etc/rc2.d/S01stratux
-	ln -sf /etc/init.d/stratux /etc/rc6.d/K01stratux
-=======
 	rm -f /etc/init.d/stratux
 	cp __lib__systemd__system__stratux.service /lib/systemd/system/stratux.service
 	cp __root__stratux-pre-start.sh /root/stratux-pre-start.sh
 	chmod 644 /lib/systemd/system/stratux.service
 	chmod 744 /root/stratux-pre-start.sh
 	ln -fs /lib/systemd/system/stratux.service /etc/systemd/system/multi-user.target.wants/stratux.service
->>>>>>> origin/master
 	make www
 	cp -f dump1090/dump1090 /usr/bin/
 
diff --git a/image/mkimg.sh b/image/mkimg.sh
index edc72560..4bdccddf 100755
--- a/image/mkimg.sh
+++ b/image/mkimg.sh
@@ -53,14 +53,13 @@ cp -f interfaces mnt/etc/network/interfaces
 #custom hostapd start script
 cp stratux-wifi.sh mnt/usr/sbin/
 chmod 755 mnt/usr/sbin/stratux-wifi.sh
-<<<<<<< HEAD
+
 #ping udev
 cp -f 99-uavionix.rules mnt/etc/udev/rules.d
-=======
+
 #fan/temp control script
 cp fancontrol.py mnt/usr/bin/
 chmod 755 mnt/usr/bin/fancontrol.py
->>>>>>> origin/master
 
 #isc-dhcp-server config
 cp -f isc-dhcp-server mnt/etc/default/isc-dhcp-server
diff --git a/selfupdate/makeupdate.sh b/selfupdate/makeupdate.sh
index b08a2f64..d6a2d174 100755
--- a/selfupdate/makeupdate.sh
+++ b/selfupdate/makeupdate.sh
@@ -30,12 +30,9 @@ cp image/modules.txt work/bin/
 cp image/stxAliases.txt work/bin/
 cp image/hostapd_manager.sh work/bin/
 cp image/10-stratux.rules work/bin/
-<<<<<<< HEAD
 cp image/99-uavionix.rules work/bin/
-=======
 cp image/motd work/bin/
 cp image/fancontrol.py work/bin/
->>>>>>> origin/master
 
 #TODO: librtlsdr.
 cd work/