Fix bad merge

jestjs · Jul 22, 2019 · 1fd37c9 · 1fd37c9
1 parent 0e49085
commit 1fd37c9
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/packages/jest-serializer/src/__tests__/index.test.ts b/packages/jest-serializer/src/__tests__/index.test.ts
@@ -10,11 +10,7 @@
 import fs from 'fs';
 import os from 'os';
 import path from 'path';
-<<<<<<< HEAD
-import v8 from 'v8';
 import prettyFormat from 'pretty-format';
-=======
->>>>>>> Fix lint
 
 import serializer from '..';