YaCy-UI: small bugfix

git-svn-id: https://svn.berlios.de/svnroot/repos/yacy/trunk@5601 6c8d7289-2bf4-0310-a012-ef5d649a1542

htroot/yacy/ui/index.html

@@ -194,13 +194,8 @@
         		},
         		Edit: function() {
 					data = {
-<<<<<<< .mine
 						"old": $("input[name='tag1']").getValue(),
 						"new": $("input[name='tag2']").getValue()
-=======
-						"old": $("input[@name='tag1']").getValue(),
-						"new": $("input[@name='tag2']").getValue()
->>>>>>> .r5596
 					};
 					$.ajax({
 						type: "GET",