conflicts

38d3a8be · Open Source Developer · 61c07e07 · 38d3a8be · 38d3a8be
Commit 38d3a8be authored Mar 11, 2017 by Open Source Developer
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 3 deletions

source/actions/logininfo.actions.ts source/actions/logininfo.actions.ts +1 -1

source/app.settings.ts source/app.settings.ts +2 -2

No files found.
--- a/source/actions/logininfo.actions.ts
+++ b/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,

--- a/source/app.settings.ts
+++ b/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';