delete fdp & smartharvester settings: config from environement and get user...

delete fdp & smartharvester settings: config from environement and get user connected to provide tokens

src/app/authentication/services/auth.service.ts

@@ -6,13 +6,8 @@ import { map } from "rxjs/operators";
 import { AppConfiguration } from 'src/app/AppConfiguration';
 
 
-<<<<<<< HEAD
 const AUTH_API = "http://localhost:8080/harvester/auth";
 const F2DSAPI = "https://f2ds.eosc-pillar.eu"
-=======
-const AUTH_API = "https://ffds.eosc-pillar.eu/harvester/auth";
-const F2DSAPI = "https://ffds.eosc-pillar.eu"
->>>>>>> c3c1ead3ae1d28e003a33da588d1b6130e0145fb
 const httpOptions = {
   headers: new HttpHeaders({ 'Content-Type': 'application/json' })
 };