From 71078358a5ee9bc7c404aa57ec60b0b2067b2f38 Mon Sep 17 00:00:00 2001
From: Calin Crisan <ccrisan@gmail.com>
Date: Tue, 7 Mar 2017 20:15:30 +0200
Subject: [PATCH] odroidc1, odroidc2: fix some merge leftovers

---
 board/odroidc1/overlay/etc/os.conf | 4 ----
 board/odroidc2/overlay/etc/os.conf | 4 ----
 2 files changed, 8 deletions(-)

diff --git a/board/odroidc1/overlay/etc/os.conf b/board/odroidc1/overlay/etc/os.conf
index 859ab7c415..d3ce9dfd6c 100644
--- a/board/odroidc1/overlay/etc/os.conf
+++ b/board/odroidc1/overlay/etc/os.conf
@@ -6,10 +6,6 @@ os_wlan="wlan0"
 os_ppp="ppp0"
 os_networkless="false"
 os_firmware_method="github"
-<<<<<<< HEAD
 os_firmware_repo="ccrisan/motioneyeos"
-=======
-os_firmware_repo="ccrisan/thingos"
->>>>>>> thingos/master
 os_firmware_username=""
 os_firmware_password=""
diff --git a/board/odroidc2/overlay/etc/os.conf b/board/odroidc2/overlay/etc/os.conf
index 859ab7c415..d3ce9dfd6c 100644
--- a/board/odroidc2/overlay/etc/os.conf
+++ b/board/odroidc2/overlay/etc/os.conf
@@ -6,10 +6,6 @@ os_wlan="wlan0"
 os_ppp="ppp0"
 os_networkless="false"
 os_firmware_method="github"
-<<<<<<< HEAD
 os_firmware_repo="ccrisan/motioneyeos"
-=======
-os_firmware_repo="ccrisan/thingos"
->>>>>>> thingos/master
 os_firmware_username=""
 os_firmware_password=""