Sfoglia il codice sorgente

removed merge conflixt

chase 2 anni fa
parent
commit
9d03957c8f
1 ha cambiato i file con 0 aggiunte e 6 eliminazioni
  1. 0 6
      src/utils/RequestUtils.ts

+ 0 - 6
src/utils/RequestUtils.ts

@@ -25,14 +25,8 @@ import Config from 'react-native-config'
 //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.3.102:8001'   // 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'
->>>>>>> 1bafe44f24d939cee3cdf11ede64c91b77e42d14
 
 // export const API_URL = Config.API_URL