From: jzaefferer Date: Tue, 28 Dec 2010 14:31:14 +0000 (+0100) Subject: Cleanup bad earlier merge. X-Git-Tag: 1.9m4~83 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=74ddb3061ed1282b207c2791da51ae6ef6186936;p=jquery-ui.git Cleanup bad earlier merge. --- 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