diff options
author | Luke Bennett <lukeeeebennettplus@gmail.com> | 2016-08-11 15:10:23 +0100 |
---|---|---|
committer | Luke Bennett <lukeeeebennettplus@gmail.com> | 2016-08-18 23:46:23 +0100 |
commit | 2f8fada6c06d7ed67307119bf22e9743429c18be (patch) | |
tree | eb3de7c38e60cf95998e35a6b37945e2567aacab /app/assets/javascripts/search_autocomplete.js | |
parent | 3e1e9b670fdb12159e31664c3757df6696db90e1 (diff) | |
download | gitlab-ce-2f8fada6c06d7ed67307119bf22e9743429c18be.tar.gz |
Fixed conflicts
Diffstat (limited to 'app/assets/javascripts/search_autocomplete.js')
-rw-r--r-- | app/assets/javascripts/search_autocomplete.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/assets/javascripts/search_autocomplete.js b/app/assets/javascripts/search_autocomplete.js index 4579214bd2f..37451d406ec 100644 --- a/app/assets/javascripts/search_autocomplete.js +++ b/app/assets/javascripts/search_autocomplete.js @@ -9,7 +9,7 @@ BACKSPACE: 8, ENTER: 13, UP: 38, - DOWN: 40 + DOWN: 40 }; function SearchAutocomplete(opts) { |