update testcalls

Author: Jeroen Wouters

src/views/TestCalls.vue

@@ -237,7 +237,6 @@ export default defineComponent({
             },
             call: (vars: any) => RepositoryFactory.get(LocationCheckRepository).updateLocationCheck(`checks/camp_location/${vars.checkID}`, [])
         },
-<<<<<<< HEAD
         'addSearchedLocation': {
             vars: {
                 checkID: '',
@@ -258,8 +257,6 @@ export default defineComponent({
             },
             call: (vars: any) => RepositoryFactory.get(LocationRepository).search(vars.query, vars.groupID)
         },
-=======
->>>>>>> update testcalls
         'searchMembers': {
             vars: {
                 query: '',