From 0906638f621416c55fe17ea5edfa61e54f0d01a4 Mon Sep 17 00:00:00 2001
From: roopkt <roopkt@gmail.com>
Date: Mon, 13 Nov 2017 16:36:35 -0500
Subject: [PATCH] fixing merge issue #544

---
 modules/router-store/spec/integration.spec.ts | 2 +-
 modules/store-devtools/spec/config.spec.ts    | 3 +--
 modules/store-devtools/src/instrument.ts      | 2 --
 3 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/modules/router-store/spec/integration.spec.ts b/modules/router-store/spec/integration.spec.ts
index a8826bfdce..f577e9365c 100644
--- 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;
-}
\ No newline at end of file
+}
diff --git a/modules/store-devtools/spec/config.spec.ts b/modules/store-devtools/spec/config.spec.ts
index 92b7314015..4e1b8c5378 100644
--- 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
index 0e4bd37e39..6dd0690373 100644
--- 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 {