chore(*): merge conflicts

thymikee · Sep 24, 2018 · b342224 · b342224
1 parent af15827
commit b342224
Showing 1 changed file with 0 additions and 2 deletions.
diff --git a/setupJest.js b/setupJest.js
@@ -36,7 +36,6 @@ const MySerializer = {
     }
   }
 };
-const HTMLCommentSerializer = require('./HTMLCommentSerializer');
 const getTestBed = require('@angular/core/testing').getTestBed;
 const BrowserDynamicTestingModule = require('@angular/platform-browser-dynamic/testing').BrowserDynamicTestingModule;
 const platformBrowserDynamicTesting = require('@angular/platform-browser-dynamic/testing').platformBrowserDynamicTesting;
@@ -46,6 +45,5 @@ getTestBed().initTestEnvironment(
   platformBrowserDynamicTesting()
 );
 
-expect.addSnapshotSerializer(HTMLCommentSerializer);
 expect.addSnapshotSerializer(AngularSnapshotSerializer);
 expect.addSnapshotSerializer(MySerializer);