maxmustermann/vscode
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

fix merge-conflict for browser

Browse source
This commit is contained in:
Martin Aeschlimann 2020-06-26 10:54:29 +02:00
parent 93be71f689
commit ae1599a0b7
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
extensions/merge-conflict/package.json
View file

@ -17,7 +17,7 @@
"*"
],
"main": "./out/mergeConflictMain",
"browser": "./dist/mergeConflictBrowserMain",
"browser": "./dist/browser/mergeConflictBrowserMain",
"scripts": {
"compile": "gulp compile-extension:merge-conflict",
"watch": "gulp watch-extension:merge-conflict"