Skip to content

G
gitlab-ce
Commit 6d3c5321 authored by Phil Hughes's avatar Phil Hughes
Browse files
Options

fixed conflicts in api.js

parent 921c2fde
Hide whitespace changes
Inline Side-by-side
Showing with 0 additions and 3 deletions
app/assets/javascripts/api.js
View file @ 6d3c5321
...@@ -254,7 +254,6 @@ const Api = { ...@@ -254,7 +254,6 @@ const Api = {
}); });
}, },
<<<<<<< HEAD
approverUsers(search, options, callback = $.noop) { approverUsers(search, options, callback = $.noop) {
const url = Api.buildUrl('/autocomplete/users.json'); const url = Api.buildUrl('/autocomplete/users.json');
return axios return axios
...@@ -291,8 +290,6 @@ const Api = { ...@@ -291,8 +290,6 @@ const Api = {
}); });
}, },
=======
>>>>>>> upstream/master
buildUrl(url) { buildUrl(url) {
let urlRoot = ''; let urlRoot = '';
if (gon.relative_url_root != null) { if (gon.relative_url_root != null) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7