Cleanup bad earlier merge.

mdellanoce · Dec 28, 2010 · 74ddb30 · 74ddb30
1 parent e724f58
commit 74ddb30
Showing 1 changed file with 0 additions and 1 deletion.
diff --git a/demos/autocomplete/multiple-remote.html b/demos/autocomplete/multiple-remote.html
@@ -1,7 +1,6 @@
 <!DOCTYPE html>
 <html lang="en">
 <head>
-<<<<<<< HEAD
 	<meta charset="utf-8">
 	<title>jQuery UI Autocomplete - Multiple, remote</title>
 	<link rel="stylesheet" href="../../themes/base/jquery.ui.all.css">