multas

2019-01-18 13:03:31 -06:00
parent 594fe5040e
commit 71d658d180
6 changed files with 227 additions and 13 deletions
@@ -1,12 +1,7 @@
 const api = {}

-<<<<<<< HEAD
 api.url = 'http://f60a9553.ngrok.io'
 // api.url = 'http://venus.acatlan.unam.mx:3010'
-=======
-// api.url = 'http://localhost:3000'
-api.url = 'http://venus.acatlan.unam.mx:3010'
->>>>>>> 6de917e80504bc12a5975c20b98a18e052721f1a
 api.isAuth = function () {
  if (window.localStorage.pcpumaT && window.localStorage.pcpumaU) {
    return true