Resolve app/assets/javascripts/api.js

app/assets/javascripts/api.js

@@ -25,10 +25,7 @@ const Api = {
   commitPipelinesPath: '/:project_id/commit/:sha/pipelines',
   branchSinglePath: '/api/:version/projects/:id/repository/branches/:branch',
   createBranchPath: '/api/:version/projects/:id/repository/branches',
-<<<<<<< HEAD
   geoNodesPath: '/api/:version/geo_nodes',
-=======
->>>>>>> upstream/master
 
   group(groupId, callback) {
     const url = Api.buildUrl(Api.groupPath).replace(':id', groupId);
@@ -241,7 +238,6 @@ const Api = {
     });
   },
 
-<<<<<<< HEAD
   approverUsers(search, options, callback = $.noop) {
     const url = Api.buildUrl('/autocomplete/users.json');
     return axios
@@ -278,8 +274,6 @@ const Api = {
       });
   },
 
-=======
->>>>>>> upstream/master
   buildUrl(url) {
     let urlRoot = '';
     if (gon.relative_url_root != null) {