fixing merge issue #544

ngrx · Nov 13, 2017 · 0906638 · 0906638
1 parent 2ba38f4
commit 0906638
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 5 deletions.
diff --git a/modules/router-store/spec/integration.spec.ts b/modules/router-store/spec/integration.spec.ts
@@ -590,4 +590,4 @@ function logOfRouterAndStore(router: Router, store: Store<any>): any[] {
   );
   store.subscribe(store => log.push({ type: 'store', state: store.reducer }));
   return log;
-}
+}
diff --git a/modules/store-devtools/spec/config.spec.ts b/modules/store-devtools/spec/config.spec.ts
@@ -7,7 +7,7 @@ describe('StoreDevtoolsOptions', () => {
     options.name = 'my instance';
     expect(options.name).toBe('my instance');
   });
- 
+
   it('can be initialized with actionSanitizer', () => {
     const options = new StoreDevtoolsConfig();
     function sanitizer(action: Action, id: number): Action {
@@ -24,5 +24,4 @@ describe('StoreDevtoolsOptions', () => {
     options.actionSanitizer = stateSanitizer;
     expect(options.actionSanitizer).toEqual(stateSanitizer);
   });
-
 });
diff --git a/modules/store-devtools/src/instrument.ts b/modules/store-devtools/src/instrument.ts
@@ -66,7 +66,6 @@ export function noMonitor(): null {
   return null;
 }
 
-
 export function noActionSanitizer(): null {
   return null;
 }
@@ -77,7 +76,6 @@ export function noStateSanitizer(): null {
 
 export const DEFAULT_NAME = 'NgRx Store DevTools';
 
-
 export function createConfig(
   _options: StoreDevtoolsOptions
 ): StoreDevtoolsConfig {
-Original file line number
+Diff line change
@@ Expand Up @@
       );
       store.subscribe(store => log.push({ type: 'store', state: store.reducer }));
       return log;
-    }
+    }