fix merge problem

This commit is contained in:
Tobias Koppers 2018-07-05 10:42:45 +02:00
parent 0a06f19fd8
commit 0e80d223f2
1 changed files with 2 additions and 2 deletions

View File

@ -693,7 +693,7 @@ exports[`StatsTestCases should print correct stats for concat-and-sideeffects 1`
`;
exports[`StatsTestCases should print correct stats for define-plugin 1`] = `
"Hash: cfe08d4450db77f81610f4228fcb997ec81e2aa6ea3a5ddabdf239863047
"Hash: cfe08d4450db77f81610f4228fcb997ec81e2aa6bb43e7d151657ea2b793
Child
Hash: cfe08d4450db77f81610
Time: Xms
@ -711,7 +711,7 @@ Child
Entrypoint main = main.js
[0] ./index.js 24 bytes {0} [built]
Child
Hash: ea3a5ddabdf239863047
Hash: bb43e7d151657ea2b793
Time: Xms
Built at: Thu Jan 01 1970 00:00:00 GMT
Asset Size Chunks Chunk Names