peter/doneit-web
1
0
Fork 0
mirror of https://code.equilibrium.co.ao/ITO/doneit-web.git synced 2026-04-18 12:37:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

resolve conflit

Browse Source
This commit is contained in:
Hirondino Van-Dunem
2022-12-15 18:04:49 +01:00
parent 042e815748 839062013b
commit 9d6dda91a8
416 changed files with 37702 additions and 2316 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/environments/environment.ts
+14
View File
@@ -44,6 +44,7 @@ export const environment = {
production: false,
//apiURL: 'https://gabinetedigital.dyndns.info/GabineteDigital.Services/V5/api/',
<<<<<<< HEAD
apiURL: 'https://gd-api.oapr.gov.ao/api/',
@@ -57,6 +58,14 @@ export const environment = {
// apiWsChatUrl: 'wss://gdchat-dev.dyndns.info/websocket',
=======
apiURL: 'https://gd-api.oapr.gov.ao/GabineteDigital.Services/V5/api/',
//apiURL: 'https://gdapi-dev.dyndns.info/GabineteDigital.Services/V5/api/',
apiChatUrl: 'https://gd-chat.oapr.gov.ao/api/v1/',
apiWsChatUrl: 'ws://gd-chat.oapr.gov.ao/websocket',
// apiChatUrl: 'https://gdchat-dev.dyndns.info/api/v1/',
// apiWsChatUrl: 'wss://gdchat-dev.dyndns.info/websocket',
>>>>>>> 839062013b575d399f5309046afd9d240f4b484c
/* apiChatUrl: 'https://www.tabularium.pt/api/v1/',
apiWsChatUrl: 'wss://www.tabularium.pt/websocket', */
@@ -66,11 +75,16 @@ export const environment = {
defaultuser: 'paulo.pinto@gabinetedigital.local',//paulo.pinto paulo.pinto@gabinetedigital.local
defaultuserpwd: 'tabteste@006', //tabteste@006,
<<<<<<< HEAD
chatOffline: true,
presidencia: false,
=======
chatOffline: true,
presidencia: false,
>>>>>>> 839062013b575d399f5309046afd9d240f4b484c
};