Fix lint

jestjs · Jul 21, 2019 · f45f978 · f45f978
1 parent 3e004e0
commit f45f978
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/packages/jest-serializer/src/__tests__/index.test.ts b/packages/jest-serializer/src/__tests__/index.test.ts
@@ -10,8 +10,11 @@
 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 '..';