Mais alterações de merge e padronização

2022-05-02 19:49:47 -05:00
parent 0032d529b1
commit f848e20492
2 changed files with 4 additions and 15 deletions
--- a/src/config/api.config.ts
+++ b/src/config/api.config.ts
@@ -1,24 +1,12 @@
-<<<<<<< HEAD
-import environment from "../constants/environment";
+import environment from "../environments/environment";

 const getBaseUrl = (): string => {
  // const { hostname } = window.location;
-  
-=======
-import environment from "../environments/environment";
-
-function getBaseUrl() {
-  const { hostname } = window.location;
->>>>>>> 561e8597e0534b18b8dfbf5b454030b6d9a0cdbc
  const { url } = environment;

  let apiUrl = null;
  
-<<<<<<< HEAD
-  // if (hostname === 'projeto-integrado-f-web.herokuapp.com') {
-=======
  // if (hostname === '') {
->>>>>>> 561e8597e0534b18b8dfbf5b454030b6d9a0cdbc
  //   apiUrl = url.prod;
  // } else {
    apiUrl = url.local;