diff options
| author | jzaefferer <joern.zaefferer@gmail.com> | 2010-12-28 15:31:14 +0100 |
|---|---|---|
| committer | jzaefferer <joern.zaefferer@gmail.com> | 2010-12-28 15:31:14 +0100 |
| commit | 74ddb3061ed1282b207c2791da51ae6ef6186936 (patch) | |
| tree | 1b071f5caf5a6a851954bdc57f73709fd4a87d20 | |
| parent | e724f585bf0a31ceb0b22a0264af8da2f4e19414 (diff) | |
| download | jquery-ui-74ddb3061ed1282b207c2791da51ae6ef6186936.tar.gz jquery-ui-74ddb3061ed1282b207c2791da51ae6ef6186936.zip | |
Cleanup bad earlier merge.
| -rw-r--r-- | demos/autocomplete/multiple-remote.html | 1 |
1 files changed, 0 insertions, 1 deletions
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 @@ <!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"> |