From b03e0ce4feecea1e50705cd3fd7a4119d04cdc6d Mon Sep 17 00:00:00 2001
From: Jonathan Bauer
Date: Thu, 30 Jan 2014 11:36:31 +0100
Subject: [rfs-s31] oops

---
 remote/rootfs/rootfs-stage31/data/inc/udhcpc-trigger | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/remote/rootfs/rootfs-stage31/data/inc/udhcpc-trigger b/remote/rootfs/rootfs-stage31/data/inc/udhcpc-trigger
index 50ace72e..a2c45378 100755
--- a/remote/rootfs/rootfs-stage31/data/inc/udhcpc-trigger
+++ b/remote/rootfs/rootfs-stage31/data/inc/udhcpc-trigger
@@ -79,11 +79,7 @@ if [ -n "$hostname" ]; then
 	echo "..setting hostname $hostname (fqdn: $fqdn).."
 	echo "$fqdn" > "/proc/sys/kernel/hostname"
 	echo "$fqdn" > "/etc/hostname"
-<<<<<<< HEAD
 	echo "$ip $fqdn $hostname" >> "/etc/hosts"
-=======
-	echo "$ip $fqdn $hostname" > "/etc/hosts"
 	echo "SLX_HOSTNAME='$hostname'" >> "/run/config"
->>>>>>> 7d9fdc9dc8069ddb9f55a527119cc86894f2ed3b
 fi
 
-- 
cgit v1.2.3-55-g7522