Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Revert "[v3.0] New hashing algorithm that "fixes (nearly) everything" (…
- Loading branch information
1 parent
8fca7dd
commit 7c7b708
Showing
2 changed files
with
0 additions
and
8 deletions.
There are no files selected for viewing
4 changes: 0 additions & 4 deletions
4
...rm/samples/emit-file/filenames-function-patterns/_expected/amd/entry-main-5940aabc-amd.js
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,10 +1,6 @@ | ||
| define(['require'], (function (require) { 'use strict'; | ||
|
|
||
| console.log('main'); | ||
| <<<<<<<< HEAD:test/chunking-form/samples/emit-file/filenames-function-patterns/_expected/amd/entry-main-5940aabc-amd.js | ||
| new Promise(function (resolve, reject) { require(['./chunk-deb-87ce45a9-amd'], resolve, reject); }).then(console.log); | ||
| ======== | ||
| new Promise(function (resolve, reject) { require(['./chunk-deb-faae56f2-amd'], resolve, reject); }).then(console.log); | ||
| >>>>>>>> 3030e2f11 ([v3.0] New hashing algorithm that "fixes (nearly) everything" (#4543)):test/chunking-form/samples/emit-file/filenames-function-patterns/_expected/amd/entry-main-aaf15a0c-amd.js | ||
|
|
||
| })); |
4 changes: 0 additions & 4 deletions
4
...rm/samples/emit-file/filenames-function-patterns/_expected/cjs/entry-main-9cf3a232-cjs.js
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,8 +1,4 @@ | ||
| 'use strict'; | ||
|
|
||
| console.log('main'); | ||
| <<<<<<<< HEAD:test/chunking-form/samples/emit-file/filenames-function-patterns/_expected/cjs/entry-main-9cf3a232-cjs.js | ||
| Promise.resolve().then(function () { return require('./chunk-deb-69905607-cjs.js'); }).then(console.log); | ||
| ======== | ||
| Promise.resolve().then(function () { return require('./chunk-deb-2221fa83-cjs.js'); }).then(console.log); | ||
| >>>>>>>> 3030e2f11 ([v3.0] New hashing algorithm that "fixes (nearly) everything" (#4543)):test/chunking-form/samples/emit-file/filenames-function-patterns/_expected/cjs/entry-main-69b6552e-cjs.js |