From 74ddb3061ed1282b207c2791da51ae6ef6186936 Mon Sep 17 00:00:00 2001 From: jzaefferer Date: Tue, 28 Dec 2010 15:31:14 +0100 Subject: [PATCH] Cleanup bad earlier merge. --- demos/autocomplete/multiple-remote.html | 1 - 1 file changed, 1 deletion(-) diff --git a/demos/autocomplete/multiple-remote.html b/demos/autocomplete/multiple-remote.html index f0ea7aafd..b5111dd4e 100644 --- a/demos/autocomplete/multiple-remote.html +++ b/demos/autocomplete/multiple-remote.html @@ -1,7 +1,6 @@ -<<<<<<< HEAD jQuery UI Autocomplete - Multiple, remote