From b82c3d89e94bb555c5f5bdf543ea5965742756ee Mon Sep 17 00:00:00 2001
From: Bob Van Landuyt <bob.vanlanduyt@scarlet.be>
Date: Tue, 21 Dec 2010 15:43:25 +0100
Subject: [PATCH] Merged to fast

---
 public/javascripts/iphone.js | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/public/javascripts/iphone.js b/public/javascripts/iphone.js
index 45ab080..8263186 100644
--- a/public/javascripts/iphone.js
+++ b/public/javascripts/iphone.js
@@ -16,10 +16,6 @@ $(function(){
 		if ($("#interface_connected_to-button").length > 0) {
 			$("#interface_connected_to").selectmenu("refresh", true)
 		};
-<<<<<<< HEAD
-=======
-		
->>>>>>> refs/remotes/origin/master
 	});
 	//Trigger the event onload to only display possible values
 	$("select[id$=_interface_type]").trigger("change");