From 8f80e2556ecf1fa2cf5fc92ae454b277a310b88f Mon Sep 17 00:00:00 2001
From: enoch85 <enoch85@gmail.com>
Date: Tue, 14 Jun 2016 23:52:29 +0200
Subject: [PATCH] remove git output

---
 nextcloud-startup-script.sh | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/nextcloud-startup-script.sh b/nextcloud-startup-script.sh
index 17f88b0a..45fdebeb 100644
--- a/nextcloud-startup-script.sh
+++ b/nextcloud-startup-script.sh
@@ -25,22 +25,11 @@ UNIXPASS=nextcloud
 fi
 
 # Set correct interface
-<<<<<<< HEAD
 CURRENTIFACE1=$(cat /etc/network/interfaces | sed -n '/lo/,/iface/p' | awk '{print $3}'| sed "3d" | sed "1d")
 CURRENTIFACE2=$(cat /etc/network/interfaces | sed -n '/iface/,/inet/p' | awk '{print $2}' | sed "1d" | sed "2d" | sed "1d")
 sed -i "s|$CURRENTIFACE1|$IFACE|g" /etc/network/interfaces
 sed -i "s|$CURRENTIFACE2|$IFACE|g" /etc/network/interfaces
 service networking restart
-=======
-if grep -Fxq "eth0" /etc/network/interfaces
-then
-    sed -i "s|eth0|$IFACE|g" /etc/network/interfaces
-    service networking restart
-else
-    sed -i "s|ens33|$IFACE|g" /etc/network/interfaces
-    service networking restart
-fi
->>>>>>> 575469868ec50e2d25c9de7d9ab5dc7e3e7448fe
 
 # Check network
 echo "Testing if network is OK..."