Merged to fast

openminds · Dec 21, 2010 · b82c3d8 · b82c3d8
1 parent bb2400b
commit b82c3d8
Showing 1 changed file with 0 additions and 4 deletions.
diff --git 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");