conflicts

source/actions/logininfo.actions.ts

@@ -12,7 +12,7 @@ export class LoginInfoActions {
     private _hds: HelperDataService) {}
 
  
-  getloginInfo = (loginInfo) => {
+ getloginInfo = (loginInfo) => {
  return this._hds.getCurrentUser(loginInfo.auth_token, loginInfo.auth_role).then (loginInfos => {
       return this._ngRedux.dispatch({
         type: LOGININFO_SAVE,

source/app.settings.ts

-export const API_ENDPOINT = 'http://localhost/drupal-8.2.5';
+export const API_ENDPOINT = 'http://localhost/angular/eepal-front/drupal';
 export class AppSettings {
 
    public static get API_ENDPOINT(): string {
-      return 'http://localhost/drupal-8.2.5';
+      return 'http://localhost/angular/eepal-front/drupal';
    //	     return 'http://localhost/angular/eepal-front/drupal';
   //     return 'http://localhost/drupal';
 //   	     return 'http://localhost/angular/eepal-front/drupal';