浏览代码

removed leftover merge tag

cdmoss 2 年之前
父节点
当前提交
c1dec262a5
共有 1 个文件被更改,包括 0 次插入6 次删除
  1. 0 6
      src/utils/RequestUtils.ts

+ 0 - 6
src/utils/RequestUtils.ts

@@ -11,14 +11,8 @@
 //export const API_URL = 'http://192.168.3.81:8000'
 // export const API_URL = 'https://staging.clicknpush.ca'
 
-<<<<<<< HEAD
 //export const API_URL = 'http://192.168.1.68:8000'   // Chase
 //export const API_URL = 'http://192.168.0.22:8000'       // Eric
 export const API_URL = 'https://app.clicknpush.ca'
-=======
-// export const API_URL = 'http://192.168.3.102:8000'   // Chase
-export const API_URL = 'http://192.168.0.22:8000'       // Eric
-//export const API_URL = 'https://app.clicknpush.ca'
->>>>>>> global-alerts
 
 // export const API_URL = Config.API_URL