Cleanup.

selfupdate/makeupdate.sh

@@ -39,8 +39,6 @@ cp image/stratux-wifi.sh work/bin/
 cp image/rc.local work/bin/
 cp image/dhcpd.conf work/bin/
 cp image/interfaces work/bin/
-<<<<<<< HEAD
-<<<<<<< HEAD
 cp test-data/ahrs/ahrs_table.log work/bin/
 cp ahrs_approx work/bin/