Resolve merge conflicts: README + ignore IDE files
This commit is contained in:
6
assets/json/perfiles.json
Normal file
6
assets/json/perfiles.json
Normal file
@@ -0,0 +1,6 @@
|
||||
[
|
||||
{ "name": "Usuario Demo Centro", "email": "centro@demo.local", "password": "123456", "colonia": "Zona Centro", "routeId": "RUTA-01" },
|
||||
{ "name": "Usuario Demo Arboledas", "email": "arboledas@demo.local", "password": "123456", "colonia": "Las Arboledas", "routeId": "RUTA-01" },
|
||||
{ "name": "Usuario Demo Trojes", "email": "trojes@demo.local", "password": "123456", "colonia": "Trojes", "routeId": "RUTA-13" },
|
||||
{ "name": "Usuario Demo Insurgentes", "email": "insurgentes@demo.local", "password": "123456", "colonia": "Las Insurgentes", "routeId": "RUTA-12" }
|
||||
]
|
||||
Reference in New Issue
Block a user