merge

2023-09-06 11:38:05 +03:00 · 2023-09-06 11:38:05 +03:00 · c97c909ba0
parent 25da19605d
commit c97c909ba0
1 changed files with 0 additions and 4 deletions
--- a/src/environments/environment.ts
+++ b/src/environments/environment.ts
@ -6,11 +6,7 @@ export const environment = {
  production: false,
  apiUrl: 'http://api.vniigazv2.lc',
  clientId: 2,
-<<<<<<< HEAD
-  clientSecret: 'tTuEbUSla2RfgM5ailI0TvHmekaR6YMTDr4aswhW',
-=======
  clientSecret: 'pwyOjmmtHGUUM8KFPjgZrpbbrrJkQ45PkthQ5Xtp',
->>>>>>> 32d2a0ff67cfbf544a1ba47d7afbc7f5dce1bb6a
 };

 /*