diff --git a/demos/autocomplete/multiple-remote.html b/demos/autocomplete/multiple-remote.html index f0ea7aafd6..b5111dd4e6 100644 --- a/demos/autocomplete/multiple-remote.html +++ b/demos/autocomplete/multiple-remote.html @@ -1,7 +1,6 @@
-<<<<<<< HEAD