]> source.dussan.org Git - jquery-ui.git/commitdiff
projects / jquery-ui.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: e724f58)
Cleanup bad earlier merge.
authorjzaefferer <joern.zaefferer@gmail.com>
Tue, 28 Dec 2010 14:31:14 +0000 (15:31 +0100)
committerjzaefferer <joern.zaefferer@gmail.com>
Tue, 28 Dec 2010 14:31:14 +0000 (15:31 +0100)
demos/autocomplete/multiple-remote.html patch | blob | history

diff --git a/demos/autocomplete/multiple-remote.html b/demos/autocomplete/multiple-remote.html
index f0ea7aafd606beb82955cd89a3cba700a9571765..b5111dd4e6165f73a1e569e1db3f1071de058927 100644 (file)
--- 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">
The official jQuery user interface library: https://github.com/jquery/jquery-ui