{"_id":"@theia/vscode-builtin-merge-conflict","_rev":"537-9b84429978d8706af1d1c4e8663a5ff5","name":"@theia/vscode-builtin-merge-conflict","dist-tags":{"latest":"0.2.1","next":"0.3.0-next.1750b2b231b"},"versions":{"0.1.0":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.1.0","_id":"@theia/vscode-builtin-merge-conflict@0.1.0","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"73c1e5034fbe0e9ab5aecb5e950aa6681b80747a","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.1.0.tgz","fileCount":11,"integrity":"sha512-IRSIdQ91NRW3XxqBo6fU2IkmNRVQqFhflE4rKeoPPgMXrGYwpoaIZNyPn+tPt8/3LmNYmOHwzW8QghymGkfFJA==","signatures":[{"sig":"MEUCIBLbcZ/fP9ign0IK/QAzXK3uJQYkRE4FERw2Mcw614/3AiEAsRvtjCsoWbvr+zLqf9SAiZvy+lIqzt4YE7AsvgQfPvY=","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":33140,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.4\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJcfnGgCRA9TVsSAnZWagAA+HcP/06f8/J5vbStKMqfeB8X\nps90r5KS0UzChUPmNGOnF4m8A2HFli5pRtQj1XsuidOCM0bDXnrTVRr35wYv\nsyq56s0jkNzzDx3tEMPDA+W2No5MX0SCStaium4mNUFcImd+v8MeBNlhUpbs\nkruNuNEdN7B6JijSJwZHuhvjv8Kb00sshgYTwXMXGWBDH7VC/xZOjF9iDiBD\ngxMdrdvdWMP3dCThRt0bWwEZZRks2Cwi29ljcsC7gDO5FgAGa8sXK1N9r60h\n13P8t7VAoBZUOU5a4GXQ/JoC0nkQfgPIkATyHuXt/PaNR+HViYIE0CmHk3Ec\npuW/f5dbrtrXrTfoklGSaWdLWyihjOwNWpyEYkVfqdQeJe/UdSnFmhT0/b8K\nRzJhB+IANuBrJQaBmI4QaL5uYojIl0q66vWy73VNZ3KuLjXpTT/i+XvZDBOz\niS/PvoyJyWOseSaZSnSoe5cr3TELiEvOrL1ORpTURP1ABgw5VpuYsB6J3gow\nzio9s5l9drbNnrz7h61RPmJ+lcwRZI+BQrbuSixfK09Pf6fq6qXG9s0QTLXt\n/dUSn6mAHa/IZED/XWgdLOUhb7jDR5nvjK6qgNLeaTK3dA6HgZAlReViQ+qn\ngLO2t4Vnd8yUhvOzH6oeTeSmA1HpoxpcQXgFPs7XCPjgmc8kQnQ2zaXh3zBZ\nPd54\r\n=0CXP\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/extension","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","engines":{"vscode":"^1.5.0"},"scripts":{"watch":"gulp watch-extension:merge-conflict","compile":"gulp compile-extension:merge-conflict"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","dependencies":{"vscode-nls":"^4.0.0"},"_hasShrinkwrap":false,"devDependencies":{"@types/node":"8.0.33"},"activationEvents":["*"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.1.0_1551790495645_0.2025525970853148","host":"s3://npm-registry-packages"}},"0.2.0":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.2.0","_id":"@theia/vscode-builtin-merge-conflict@0.2.0","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"e0b721fd98378772b8f75ea3659bd196ec12ef34","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.2.0.tgz","fileCount":11,"integrity":"sha512-6b6mXlRjr7iIGlhX9vqDbMDu+W9wGnGEzSVJDYTSqKZDQMSxL6V2C/rwEb1TnbbbDiT6+WWGiygHTs+Zi+IPew==","signatures":[{"sig":"MEUCIEwAEN6z2tHMGLsaaz+qTwFEbVOqrPjS2wHIThUgceYhAiEAhZ3uoN8lniWiqr+euhiQWyZgSOo0D/GnKNLqq6dSu9Q=","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":33032,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.4\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJdNXRDCRA9TVsSAnZWagAA2YYP/AutTGV1cvIqh3cJb9WB\ndCz5vLfz/zbqi6K7/KFGMVdpzO2ob5YVLIBuh8icBQRqVRgTe2YEpvVohVz9\nvaaNRd0bQCxoN7dUk+FgRzw8lGLwT25oyQYDYDU8zaxjzpmVKFXFI5n10uhA\nm+3YEZDyDYUdNGjgV113QtdYLg+EaaKsor/Y5gneEDb4qyO2NtIHU6iCdR/u\nQfkdBb4amHn2sV4MfcspyAZ1tXyN06o3206SnRuc9ZlycgGp6MVFU92eqraf\nGJAGwauF+w4CAE9zDyUVOf8FnAmcFXlZoqXeovdY86hCNsqbx21rz9jF+zS6\nTV4xy+7A5w0nP8XwJomYggXCbYrK6Vh3g/zkwV5A/wGW28eKs7wXTbsSdHSa\nD22KL+GtFafOwRHwh+7Rp3ZUPYOntUtlJzXAR2BvhZOG82n+gMEmW63XMdXg\nHIoN4zSM28N4rS/DnBSmC/6t5jrxjEyBhjiml/PXNk0rBKiNAS6pjHrSkfUt\nC2w4cSPG6tvuiKE1Tn21hbLhAToIkN+Ctfok7zPJ5+3NXU0g4k+qHHuDIo9B\nnc6PBPVeeBRbGrUq08aEZEDP0QFse1xO1purkqiDecezGjSRKeImdjibqK7a\nTwt3fZCFY56ZC9o2qww0urutV7XBOvVHXSu0TO4taWbvvEB24uAwlLJdbbbY\n5jU6\r\n=R8//\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/extension","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","engines":{"vscode":"^1.5.0"},"scripts":{"watch":"gulp watch-extension:merge-conflict","compile":"gulp compile-extension:merge-conflict"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","dependencies":{"vscode-nls":"^4.0.0"},"_hasShrinkwrap":false,"devDependencies":{"@types/node":"8.0.33"},"activationEvents":["*"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.2.0_1563784258420_0.056069166223567724","host":"s3://npm-registry-packages"}},"0.2.1":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.2.1","_id":"@theia/vscode-builtin-merge-conflict@0.2.1","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"c32eb0df5a536bb65c31327bbacad63353505c3a","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.2.1.tgz","fileCount":11,"integrity":"sha512-0wfwPSZ1/ISKhTHtUBPGJyLgsk7ykb7jk1N6ESkMHkly76HBDYMqiCKt4KJ9AJaTx3UGxig7wHuXt5JE5Ar87g==","signatures":[{"sig":"MEUCIQCouq7GIaoom4JPMbhonhkMGycDbAQOrNMCIQ0XN9TkgwIgHELrvpm3cezjfH54ov8kFiQ1SsUXjsB+GKGZsAcVJB8=","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":33032,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.13\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJh2d1nCRA9TVsSAnZWagAAXRIP/3/3bva2GqLE8x7wvld9\n2BI3Xt5xfrPU8SE2e1WeRw4z3hX2lBSJrTyHKIXXfy1tiOlXOaOFbcReoy+w\nCcWGaYBXr70RF9MpuZ2907MmVPUjvgWVXoTpGOdmkWJ5rNQpMVSrd3hxRvIl\nkantSnhCHXExbnVupgc07I1/in4+3R461Z2jjvAqB4NDo9wVu93p6ziXn81f\nruiVwCjvKyKblMAxlX2xDS8BAyVu33yHvqKF9GCCBCtaUG2kiSvaN3oMRMCO\nyjMLUH0g/SilUXyrvehFYsIj6LIAQZwWeeHU6/DGUsOWuhRbgZ4UpQyXLuTa\nEorbVkWivKEwPj0E0raThI2qY9tTK/qrUcGhi5hby9kH7M6tHgIdcv43adjR\ndByHP3upWHH63ayoqBZnaKjDmn86eo7botC3DNm236gkQaUk5IXlxYL653LN\nwjpejk3Y+3bMJj00L5QRcrhSkrlZAeVulOA3P8cY2N2fsQKTHmVyJIDFUfKe\nTrEfdWJHnPse3I9DXKxBTXkgLUd3d0JugZhNIDi4yLZ6ActCg/IZilrucSsH\ne3VKTlPYopu0Ioc/lAss8lXiUzVahaCwVFbXvMk9gTFbrsRssrinrEWblWfI\ns/+iecTE/BIRO9vGCmCU29h+6OHtnC6U+pVSHkKGrgYjtFFpEKAl4WHjv8lY\nmdAh\r\n=YfFE\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/extension","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","engines":{"vscode":"^1.5.0"},"scripts":{"watch":"gulp watch-extension:merge-conflict","compile":"gulp compile-extension:merge-conflict"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","dependencies":{"vscode-nls":"^4.0.0"},"_hasShrinkwrap":false,"devDependencies":{"@types/node":"8.0.33"},"activationEvents":["*"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.2.1_1563786421887_0.2879203240292012","host":"s3://npm-registry-packages"}},"0.3.0-next.db32534bf1":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.db32534bf1","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.db32534bf1","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"ebc057741360438d073d613c2dbb798292657c0b","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.db32534bf1.tgz","fileCount":12,"integrity":"sha512-JjtDm7vgdEmp6qkWpoB7BDy+7Gq4aTFRgoe+7VkuuIGRRGNrQnjo+rR5BDByA88wGkJUbfECe9zKU9HSgvbQwA==","signatures":[{"sig":"MEUCIHD7QSQU4rQ02WRgRPrSQTEp+ur3NqNDx3A09acNkzXeAiEA3j74SWQ+uSuJY3f7z+c/kYBLLUFz59CIRmb5Ec3GjEc=","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":110474,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.4\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJd0s6HCRA9TVsSAnZWagAABSEQAJdme/AhofNEX/czKe4D\ncvgnvy1c6b+TjyUyBGNU4Dt2VfJzEoTLMzA99+6NTd3Bkj53Kf4H31GPcngq\nLqDvGnyAyf6m4rFl+ZtCLgycweXs8FYhj4/IzKyLf7OYhKLjag85NaWQrC5O\nAo46enunxHdnHJIavVW7N4Fqv/VqYBDWRiRt6/AxZitcD8WrU+aD7lAsEwDj\nUOtezhbQgT/anC6rgD8ooLE7ReGe4DlvEKfF9g3MpzX0irrWLTjOcePtWpz/\njO532JIVLFUuglNp6StRSRynkJpC0USfjuc3Y/aZLO/byFeUNfViimxfi+y/\nG+SBXDvtI30B8iteE5PIN6VwpeTwGj82j0DZ41fXeZIOQUVtU6kf5HLcjHr6\n3fJMicT51zUhPywgzPMcTJcf9lxDcFLHA6GtOufdviCeXp5W7iahgRG9dKKh\nWK/Bcub4rO9tdKceyw1McXzshY8LEBu48Xw6LiGqxWw3ysD6vZW5v3QjC83F\nxPtAg3dxMdA08CET2EBbRZBzNBCPLZLfQM6L0xYcBY/W0ICpIzeJthTAZmzv\ne9VnuOknYrjoOcT1fy4IyBwOirJa0HhpJ1QOKgNGljL8sImy+1Ckk4Jtl3GM\nZnVm3GH7CpowRnbUrNOPo6/4N1EaSN+BpaJmUUmz/56HwbBeR48Ycln9pYIB\nF7Lp\r\n=xcd8\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/extension","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","engines":{"vscode":"^1.5.0"},"scripts":{"watch":"gulp watch-extension:merge-conflict","compile":"gulp compile-extension:merge-conflict"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","dependencies":{"vscode-nls":"^4.0.0"},"_hasShrinkwrap":false,"readmeFilename":"README.md","devDependencies":{"@types/node":"^12.11.7"},"activationEvents":["*"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.db32534bf1_1574096518955_0.8905059902967694","host":"s3://npm-registry-packages"}},"0.3.0-next.94116da8fa":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.94116da8fa","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.94116da8fa","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"ce87fc6819f09b596b9f9a9badf2d2d4e0cefd80","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.94116da8fa.tgz","fileCount":12,"integrity":"sha512-6hbTv4EnQUCHjcn9rzzRlTPLo/Y2CgMn+AIPsQ9aY5fRRrGAhm35lhVxC67zsunDH8SQPKdR5cpKaaHOiIzT/g==","signatures":[{"sig":"MEUCIE8ENkobRbuSRlLdrPASt4KbP3xgwWyGSRNsSopS50wsAiEAvQvNqycslIjNECslM5jp49msmdM7laoZmq9S/P6uXsU=","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":110474,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.4\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJd0wGLCRA9TVsSAnZWagAAoLoP/1nykwdPVri8HSjgNtg6\nYH5FvluFFMmaYjzPb5nxQ0kWqXROmc7eqpokHHklWvhMIuGC28+Y6taPcQkM\nOP7QIoevGgJp2gju/XCJp8e8xfTEcJItAw1jIe3kJsdZdy1i6avBHxqDTYB2\nZixFn4q7IKOCchGsv9lMYBRgKZzrWPuwWhjrDd58fBQbgCdxP7QhEomj7x90\n1lcIC2MS2CuJJPkA3GJKCprY3NHnuYDXaOd6luJEUTZVoBiWOSHqqXdnpzHb\n4dHHeh9MxYS/dARoxkvni4Demn9BT/565kbxJc3+2ii8JhRAK4HSwNxNsAQ/\n61AvUFAzAYtsqOaIGwiuHyXJwmIV7eydesV5gugw6IQWSxBvAIqqD9r7KA2V\nZr0YtLqGVrzzKXbSzz5dewsw9HAiF/DI9gXVJi6g6nyCJaLmtcvq/XNPJc12\npNVulVhWB63U/x96hd9DT/CAHKPyvVxo4Ms8ff/bkmpaLrQEh1AqfoTrUxPg\nB3Ap6fqCzCnIK4L6FMqMJZo/NYD9LdtWDUYNKeUwcTlQFcmiEvLD4Oq2dyui\nuQlQg8rL1mJM7sclD2OIS3PSAZABKLLowtBUZUnEfL89ilr1YDywURtdjyrt\nLDLlnMlhoqLwEe44Yvqj582f5/Og6GD/nLhFLv6/0fYK5F6Fkjm5GaXtThLE\n0qGL\r\n=OF07\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/extension","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","engines":{"vscode":"^1.5.0"},"scripts":{"watch":"gulp watch-extension:merge-conflict","compile":"gulp compile-extension:merge-conflict"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","dependencies":{"vscode-nls":"^4.0.0"},"_hasShrinkwrap":false,"readmeFilename":"README.md","devDependencies":{"@types/node":"^12.11.7"},"activationEvents":["*"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.94116da8fa_1574109578699_0.6127860496421282","host":"s3://npm-registry-packages"}},"0.3.0-next.1c9fd8a597":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.1c9fd8a597","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.1c9fd8a597","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"e757cacd8898cbfc57901da1ce922c5f60baa159","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.1c9fd8a597.tgz","fileCount":12,"integrity":"sha512-JLSRayWyL5VXeI8IktVi9+SZ6R05Evs2GA08Iqy8iBdMEdJNHkt7TD40Xh76WOGvYYq2Q+jVf61odh/rV2+J/A==","signatures":[{"sig":"MEQCIGRiOwMzpdfFeLW77PZVuTMBvlyCzKcfEqrXEn91iXLKAiBGmHqjZg/niY14hPA+I4pWnvi8SQIYLZQ2gy9CsNga8w==","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":110474,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.4\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJd0zmvCRA9TVsSAnZWagAA3OcP/RjRCKQQ8q1Ez7/3JGuq\nFSNbbipz3ntcKXdnvziwhhOrGCTNS3dH++ini1RFvXjfIv9ui4nSUXIMrhla\nX9u9R3VWM7pfn1FVWJVtpIzz2wOqcq8akf+UBuV1m/2YfPf4c6bzDYHRusve\nowgRPrKEqZYiYCKdrVsU+/+OkLh0dmZnNBL14mSadwGuA7a4c78MJ0E8Dkkv\nuhuIKpGBaSmJ1XMJsdFIXx8r8J9su2MieB/A2rKljnhv4yvirnMC39BuyXP5\n32eFpxXtr0zPKt/wlMObjZLAcXbiuD3r7AW8fVtEeVGhBCb5wUy/xNXaF9Jn\nUQv2N33HEmpD/E7neuZZ4klAST3IrnNjZ8+CBQ3fMFKMDJLAqI9BO+rJxdk9\n6KOa3atMD+TZ2Wv9OD4E8LoTYRYdvAXCP2DoJx8NDaVw57i4hD7jNVJ/8B4R\nMYh/tKz3kYv27CElIyJQSTgSDNbZPCuFBVnT5WEUGQGd8gcEyNUDm1ACn8Nw\nnk8rHXT1J2m52LnevQErkWpZChLN1WpxIic5X3k/EpLeEiMWAaO7p3ZHaoRZ\nxuONCy7UHTIRsTDp++RcjAikzChIrE0XX1/ANylL04JoC9/WKX/gkdvT7HxG\n1uoXtyVQOGf04CtargmnyV41MoxpBwjomlBoznXk3CL9/8W1Ua8o+dj39+JG\nY3Sz\r\n=I/gM\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/extension","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","engines":{"vscode":"^1.5.0"},"scripts":{"watch":"gulp watch-extension:merge-conflict","compile":"gulp compile-extension:merge-conflict"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","dependencies":{"vscode-nls":"^4.0.0"},"_hasShrinkwrap":false,"readmeFilename":"README.md","devDependencies":{"@types/node":"^12.11.7"},"activationEvents":["*"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.1c9fd8a597_1574123951522_0.8971014778382975","host":"s3://npm-registry-packages"}},"0.3.0-next.782f1592de":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.782f1592de","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.782f1592de","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"a3c46539b89268b4e4b662623a10d88ba3713dc4","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.782f1592de.tgz","fileCount":12,"integrity":"sha512-rk7mTRmtXhUnrfgwaw8JYhwDSSzCVaLSkegIzZY/sAVNtpLvp78TnVMf6J5OS5n7R3P43c/CR9zHC6P1plMZvw==","signatures":[{"sig":"MEYCIQDH1CXa74l9db65C8qDqPRS/Uu/ye7dhazisV856pwExgIhAIj/WhYiBEJS8GurY8unA7XUYyCTUG47GRYIK38cMAk2","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":110474,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.4\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJd06LGCRA9TVsSAnZWagAA244P/0GeYwthbLHtUP1QtPjN\nCoQjshbLe2bCZpSxCI2n7DM2gGasiZ7RMCb57QPvEh6X4R1LCRwLbQ5XW/Uh\n1ds41pI8p7epJaSOaZpvqiUX6K2jcYF9kRSBMEtwyUZCed6oU1jx0gVQjQ0K\nRyYCtu2XabKAG0lo/V4JVg3xNIB/M0YPn3nrjAh5vS3WE/+lhsmme1Dj2qNo\nR56KREQD8ypz5k8eQeHwo01uwTowMptiK07Sn0wO1iOxL3NWbNQ65xtOmmjq\nG3yMDSuoWe91wyyJoAxaiVLnGu4iszXwRUjhq+rybzDcjnqYJOZ+hyGOA+lp\nHVPMOaUM1C5Ow6Wf4IzF93WEv7oXE4ARHmEpPARqGignjPvpfzcnECgX356T\nkK95ZMiz4fabkTSFZJ0ykBoe5PAYtlL0GsCLWH0KxdoCgKkJepqQ1c6XOB0z\nLFVUADZ2hGSUgFI7PwCGDEmYhEnjyeAbNxjPVtHZWjARMhuDTw7BH38BBWzw\ny+e+uK7wvSiblYNub0AfUSQGb7WICQXiSCYY5ntcGl0q86auy43QssgLmBJM\ndmy1Lux2yiT72fhx266pUW+oepqQ5kykqaOMh9tkE+QGouBd1T6ZV/0DPBPh\nLxo8+RRH4iBwXzS9fQyLbeU2dAvkfaR8XI4YJKZv19bPnS3xTDuULY5cYwzO\noOXW\r\n=84zQ\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/extension","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","engines":{"vscode":"^1.5.0"},"scripts":{"watch":"gulp watch-extension:merge-conflict","compile":"gulp compile-extension:merge-conflict"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","dependencies":{"vscode-nls":"^4.0.0"},"_hasShrinkwrap":false,"readmeFilename":"README.md","devDependencies":{"@types/node":"^12.11.7"},"activationEvents":["*"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.782f1592de_1574150854275_0.40836593295395507","host":"s3://npm-registry-packages"}},"0.3.0-next.c9a2de2d9c":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.c9a2de2d9c","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.c9a2de2d9c","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"5a6db93b0aa81f3f0f1312f8fca0489a0d9fe8e3","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.c9a2de2d9c.tgz","fileCount":12,"integrity":"sha512-yvUrnFLbfFaCaaEbkwaanyrPnQ5EJySvPDIuLvbIkBUp3bedxt5nc6/AUvJUo3cT40bVOxsadOh1s6VLpd7mXQ==","signatures":[{"sig":"MEQCIDhfXVXekt5w5G2IeOVJo7epM5h9HMfPrJRpnhTLVYVpAiAdIre/9JMTTAk5mXAb5bEY6ot0n+aXLhQHVjNSvzFoww==","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":110474,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.4\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJd06/pCRA9TVsSAnZWagAApe0QAJXDQy/QvTFLsrttbSV1\njjjRmTO0Sg3dYpEQN5dTIXljuPBu350O0E+ES5gmO2QgCR5GDFST4+4tt+ZY\n6yvQSWujFXGjS+vjGz66eL8TIEPwHqtcKW1dKRTI8AdrtZ7cZ1ES+zhqwqGb\nACyyYCoJEX9OXg+1kt2Xy94UrNJfMJJGhAj3OXln1yDLa6RtjIvbmS6nKPoy\nxXJ8YwO/Xd10B7nGbOSYRDRQsYmAKRJv9ATP4gD/mArIGafuaDYJBW5jN0zY\nOF/qAyDPQcGMiXMi6sHayCwLa1vKVj8Wb62nPNsMsVCRfOgPbjrKC+jlPz87\ntPDmSU+dUYUqtbj0HPIl0oG8bWVhxklrVFC5y8709vTjUOxbUB6BT6w0ak3H\nYwywxRJRiULmFfFGcTbVILWXH9x0cusIX9EQbjtzG6U1Vp90uF5T6diHUWMw\nyNGQ3+/cOx1DMymo1j41s9OpzR6sGhPMVImuJ6NTxUIaLbQDTAdf5CgO/Nn/\n7KFqz0AKBHWwiApj7KAaR+PKlRJUDQtRFWEIVhO/0l7y2dW/TTo7OuJBFelR\nS10MFpO+ypHyjpO8PNnsu2uxmTGMYqT/p/8J1vOPEb01Q+t5quPl8dKLEo8e\nYgqQSMpym7bhauAIdlkGaAFdYw/KK5sB0Fn+gM3w86qzUQb9yMngVu4/mb7Q\nUoVh\r\n=XHA3\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/extension","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","engines":{"vscode":"^1.5.0"},"scripts":{"watch":"gulp watch-extension:merge-conflict","compile":"gulp compile-extension:merge-conflict"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","dependencies":{"vscode-nls":"^4.0.0"},"_hasShrinkwrap":false,"readmeFilename":"README.md","devDependencies":{"@types/node":"^12.11.7"},"activationEvents":["*"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.c9a2de2d9c_1574154217546_0.850787005402365","host":"s3://npm-registry-packages"}},"0.3.0-next.95d8353abf":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.95d8353abf","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.95d8353abf","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"cf5ae2fd425b7f21fa2a5cff680cdb608d7233ca","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.95d8353abf.tgz","fileCount":12,"integrity":"sha512-JGVraClkL7djAx2x+nbJrfCEfgYeH9rKEqRUxI2gTvJZfZkZbPkgVQjqoVHet0eyXwfSetlWBmRxYYyt0cKjuA==","signatures":[{"sig":"MEQCIFaxmcD5bqR3J2IKAVEEmn8HzspYqQVJghkOyFaeaOK8AiAuujV5BolwCATtM4VeQYqbc8bnI+FKlfc440bGGCjFjA==","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":110474,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.4\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJd1IopCRA9TVsSAnZWagAATY0P/jhPdXY8b3PCJjFuHsSl\n0rArf3ZFOxcR2oUpEbTh/OuJbt8zx50V1wTOeGgyEK4R4OR9YeqGJFT8FNms\neRlJQ0iy1BdzI0N2Dx3kavvVpdkCFi3dB0GDpU2HQ5tz5j/cPUPIhtXs67QV\nVe22274jdK+Bwrd5X0qFtWtk1/DFchyND0g4egT2G+LoOlWLUWRhBGXAZTXK\n8eV8pkkk5IsD9EtUbqUUiMPtyeKirZdJwZIhU2wv9cp2iV63ePXA5hCMi+jj\noz653ZVuhzlv9WO1x3zYCPvlZd8v/1SgsLNgKb9EJ2rx/hWhrOwD7RVCpS3p\nJVOuRzBOwxb9mueEAMuSBU9AunhH0xCxjq2oFwriMF8Zz6ln/npTTGWDOZnK\nltQSfwr9/Pv/PfiA4XWA7X7nFvqIoudqpZQD/dL5qsZMZYbkv82pPh5obL7t\nynGC5tEbGrR4vhjc3Knzbxh2TRrPjCFJB3ejKWSjPj0mnGSSeiLW8bEZAHGY\n1z9VamFvz1UrWbSmyvoSrw8LEorDl1BRky2G7mtLCMmO7AtHl5A2q4sWxmgA\nnb3m5Lo1w+9DdKoeRVzRQSrqrHAtYxmZf+gCH7UyJcAubVFiNtiJp2y/xxkE\njTnm2OQjbcQDMIbanUyH3kF3rg+LRikgiyVN9w1ZTLZVRsUxUCEDGcbHnDhQ\nFkTF\r\n=KTwo\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/extension","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","engines":{"vscode":"^1.5.0"},"scripts":{"watch":"gulp watch-extension:merge-conflict","compile":"gulp compile-extension:merge-conflict"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","dependencies":{"vscode-nls":"^4.0.0"},"_hasShrinkwrap":false,"readmeFilename":"README.md","devDependencies":{"@types/node":"^12.11.7"},"activationEvents":["*"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.95d8353abf_1574210089319_0.5696304140288364","host":"s3://npm-registry-packages"}},"0.3.0-next.37f18e8f2d":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.37f18e8f2d","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.37f18e8f2d","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"f1e68160e617df00d7088b449672073b78c0cb63","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.37f18e8f2d.tgz","fileCount":12,"integrity":"sha512-Wb4DHq2bNo5DTLaXI9f8RW34O0cYgovFtlXbZrzokpVX1Tj4cYJVSP0zrI5X8vOyeYIx5K5s/BLtMcV+LleUqw==","signatures":[{"sig":"MEUCIH9bnivWAhbLBLAd5GrqpzCHC9N9Qhw9zvXibBBvAwwQAiEAvUX6474pyMn6/bRyJnIkkZDX72iEiXeWlcrqgkfoKIU=","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":110474,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.4\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJd1dtYCRA9TVsSAnZWagAAU7cP/3ahp9vmPeU03V2ebluP\nUIupdClc1yblpnLHZWhWSLlfL914txJSJMPfcNxFtDb28oXic4Syc5bdYfoT\nXIwR2/qA6+j5YPbDGS3R2JV9V1UOlxnj4Vqo4+DSe6eWua6SNnIncKdli4F0\nfYgwR9ZgChdckW8gBM7THzb58APiIQsRcKltEb3puf8UGKC20/ivrna0ZBDv\n98kNbnBIIMd1UHJdYV+tDA+uYcOjvYzXBygCy5ZHg8hDC4av4gW5T/+JipeN\nYtjHY1frPgneNqRt1rQCUA4B+ANdHp4oy8mpSMBms9/MAm+It/kpkqL+Vk4S\nuI07dE2ZNE3uRFr1BlNv5LZK4qi1J5EiJpFyWYP9uPPYg8/uFcJmcfm7Fiyo\nNFWEWwTD9Pup2V1j20zHE4BVuZTkQYNJenjfTeaVPe1HJz0swuOWHGER3BOY\nsZPICgaErAYD/OFFRSTJt/ieOGJeeuVTByRnOlwvU4+ZdpYpXvpMlqJ2fI3I\n80GgbGNzArPWgLwv8fuX3IP24uZ8edAe+SNLYVC904M8ZUg7HzahCo/RinFj\nZvUXAR1zbRS9HkwG6rbzxMBq5LngdJlijG9aXMM75/9if9LZIunIVHLraxz4\nJpnEhN1ptfzyoUK0ITJrPcwlr7b7wZAt4XP1cBUXbd7Rp03H219PlxVBphay\nrfzG\r\n=sTTp\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/extension","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","engines":{"vscode":"^1.5.0"},"scripts":{"watch":"gulp watch-extension:merge-conflict","compile":"gulp compile-extension:merge-conflict"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","dependencies":{"vscode-nls":"^4.0.0"},"_hasShrinkwrap":false,"readmeFilename":"README.md","devDependencies":{"@types/node":"^12.11.7"},"activationEvents":["*"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.37f18e8f2d_1574296408323_0.4555247426928659","host":"s3://npm-registry-packages"}},"0.3.0-next.9197d42531":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.9197d42531","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.9197d42531","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"e7a06b8edef6e82e1c59fdc0339fc343d3d7ba8e","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.9197d42531.tgz","fileCount":12,"integrity":"sha512-nr5rRkySbvy7bww2r7VMfeoV/FseX9nk9xt9STSNfDgdMCP7IsW0cRmGjcvnrn0g9+QshJCfkdEiRiwwoEjw5A==","signatures":[{"sig":"MEQCIF5rh5+xJOhGb/ygX1KwbwrHRi3PvX383TrCzu3J+eP1AiBkI/cLKxQ9HZIBbo0nxlbNW5Wa58Lc7++aOxxotTY/DQ==","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":110474,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.4\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJd1y5qCRA9TVsSAnZWagAAIPkP/iW5IsZ63SgCkIpKJyfY\nXzityxjH5Fo4LZS67aNMhzafjVUNB0IOc/0y/3uSq5wX3dDfhfiNyDRSoa8E\nUbOqA9ljUVR3Fp/nq4hng15dqhpotfY1TNaIC402N/anVI5lQkNoTzk0oSmF\nEJWUWP6u2NIZ49nQlnPNsYp2AWMMesRhCdMAVp5WXCcWaMp1Dt6aSoFpk0tZ\nqodn13puSaf6Ot+0B8LgW4ww9gL1dk5Ugr60g82+0QIo9aFg68ji0EpINVl4\nvo6fEEcMDsdZTRIElqVolDL8A9aa3Kbntgqu/26yTlY/RgoBXgKRBVbJ34OJ\nAVjS4T00DL/hWQhzg9LShzUgWpM3LhY/K208BoGVtBRJVqe1WUC1UBjLr6rX\neJH5Xs9xwAcGjoEWUYv6bLUnm9X7VqgQVNQLiMcc38LJDKxNMwoQEJ1au8GP\nxWmF3zVC4sVJW5FKu0VtfpZVmi7+LWgz7zkKgRcDWYj3iVYXwygccyijjAx+\nT5ImwVB7lMDg8M37/BtONU0NVyAhywPmhbWQ8Gz8XSZIECmpW+FkVBKDzsT1\nkDg5YH+eMUxlE5A9dmCfCtMeCumPrdp+EoqBBYlWEo6Bn7L+ax9BLyu3J8Zd\n9eWgNstzDLzqpIs3f3ATX6Tg7+a2XaP10PASkPeDRga272Nn2fkQCXQ1f30F\nHYP8\r\n=/+ow\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/extension","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","engines":{"vscode":"^1.5.0"},"scripts":{"watch":"gulp watch-extension:merge-conflict","compile":"gulp compile-extension:merge-conflict"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","dependencies":{"vscode-nls":"^4.0.0"},"_hasShrinkwrap":false,"readmeFilename":"README.md","devDependencies":{"@types/node":"^12.11.7"},"activationEvents":["*"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.9197d42531_1574383209559_0.37695698217877904","host":"s3://npm-registry-packages"}},"0.3.0-next.2d0b37f031":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.2d0b37f031","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.2d0b37f031","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"fd473101b07cfd58771c881a92029a38fba9dcac","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.2d0b37f031.tgz","fileCount":12,"integrity":"sha512-5GmfcF1WBs7cvWDopGN/siAWME5YFvbi6Y2YxM2g1t5OCcSpreOdUYKann0/hOEXwt+YeHUnN9DDnR22yeh2EA==","signatures":[{"sig":"MEUCIGnoEGsuY3FCOFWg02S1SGhQJfjwmnt2E5mAQJl4s42ZAiEAhkV9L4Y4jNeCKis0SZawNHBRdVbMnXNd2XhM9NbJx0M=","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":110474,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.4\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJd2IAOCRA9TVsSAnZWagAA6a4P/AoKn+LubIX5UZVqV3oH\nBo1tYTkJyigHgs2d0oRimvs8E4wvPlFWefW3dkgaAHWuCeFUt04Nj6MF8A5f\nKAnU6tEjxY+LJZ+ywk+pIrZS+1kiUljKKSRpZCCdKYpzx8t+lkwI87nm8Bpl\nUnVZ1npaZTpgVZRWua8xQb+pQmngDbHYuvX8nQ9ayOiv74v4K2OymHSv5pr5\njx2a+4KBygND8MqPD9AQDOY9X/tL8bPIyhbWBJmJKXF6QbMaRdMsakQSqCBO\nmHGNb+mlrCP7pX49yC/Sz7C0DFc/3z+eMFfkV3f73eY1aelrFrsL68SFUIJg\nmfUQuElBXLPoigJR0XLhvAwZhS0QMaAMrc+25p8rUIxfiCz4cfHjywj3K51h\n+RHaQu7PnKlJBvj3DC/LDrLPUdK4/T7L8eV8KRvHnBx41D/xyw0jY2PjyqBJ\ngHM7C/P7PUjm80wxxb0U5TZyNcoRLQS4qusnz5exv5rUYBMDMiEVrm9+qKKb\n32h+vHrHHRTdkeMYjH5Zy3IgSgWCkhEfosg2SVrA2BJzLE7j424IBmqI/0lU\n/NEOhljoWp3LNrSXNa85h6W8bLWGJvqdY/dSLRWts1cSzgjKC3w+Qv160c5T\noI02yyLlIvYiLUmKaIBAd+ftR+EB5vlGKa1UqXMpqQIy8qjl7r915A28297g\nIdkg\r\n=DpwS\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/extension","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","engines":{"vscode":"^1.5.0"},"scripts":{"watch":"gulp watch-extension:merge-conflict","compile":"gulp compile-extension:merge-conflict"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","dependencies":{"vscode-nls":"^4.0.0"},"_hasShrinkwrap":false,"readmeFilename":"README.md","devDependencies":{"@types/node":"^12.11.7"},"activationEvents":["*"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.2d0b37f031_1574469645863_0.7640892641143642","host":"s3://npm-registry-packages"}},"0.3.0-next.c41d9dc9b4":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.c41d9dc9b4","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.c41d9dc9b4","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"454ae8da3d45ed5829532d06277ab41ddc2eb5d7","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.c41d9dc9b4.tgz","fileCount":12,"integrity":"sha512-mRKEa1TGfZyg5XOAW+kDqPbAElDyenMmFf3LwaPZ64PDq5rJD1bjbzRkp39vrqg70xvAPIQKm8l8nSc80g8mQA==","signatures":[{"sig":"MEUCIQDtlwoi1wSK97gDD2bAosuq9gu9fmReTCHWS0VzV9MCKAIgGZaqonr79eR/q9RIqNkx/eeMJyFZyW/1rMQ7mxD5Dec=","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":110474,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.4\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJd2yJdCRA9TVsSAnZWagAAzWYP/1cLOHhMOMZuYCe05Bpk\nuCVN7rF0zj/0N+6Rx7IhZH3aCc9q8z383VrCAuZAGsgP1NxUJa6v3FHg29ux\nj1wXkv8YT6btwhZEDLZ6vWwvzUr00clczxb0qLwIkLssD4bkKCZiFYbiqnYA\nbkiZkMN26h+z6fRKVw3PNM6mmgrdar3cQ3LfQhBp6wqAjNFelqUJyQIe7rTo\nnPW3oe+rU2pzA0hxvdEyLO8yxRs2iXZr+za1Fny6Ny1Jnp/iT44glF6ktxVW\nKbfRripHgcHrGd/XYFCX5NkDj+mqvekx7mRyC3JwSMSz7Lyo+/ASwCo+1bKc\n+2QewJdRiyGfx6kyk2rv/vsUwQ5uHFoq6cfU+h6/YBq12Va9E0VVVXZWevTZ\nUhdx0LIobXcT2LAJqQQn3Q8SJXv9W87pXdVKKA1SruJCEJW0cs9RU6z4Y/Kg\nejVmyMB/EiIPZGv/ZLGyzOVgPQ4Bko/W4MZ7/uKJGI5Kd/O03dZhqOts9I3B\nTZkvMdwVfxKG05NjduplaTuEtka65WsrcNlCaD38mucjsUICUFMuxcbaULMt\nfot8H6EwH6xe/EwRVv4QOduKrVN3kbbzCP6JSFq1mC0GP/k1mtdeiycfqufR\nAWr8NJ5nOgOpxV650bC1jgPCeAi8wacgU9+82dERn4M75o8YqiR4zChnQvtn\n4DPR\r\n=BxOO\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/extension","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","engines":{"vscode":"^1.5.0"},"scripts":{"watch":"gulp watch-extension:merge-conflict","compile":"gulp compile-extension:merge-conflict"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","dependencies":{"vscode-nls":"^4.0.0"},"_hasShrinkwrap":false,"readmeFilename":"README.md","devDependencies":{"@types/node":"^12.11.7"},"activationEvents":["*"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.c41d9dc9b4_1574642269608_0.740199976669526","host":"s3://npm-registry-packages"}},"0.3.0-next.85d3ccfb9e":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.85d3ccfb9e","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.85d3ccfb9e","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"2e0edc66500cbdd200af93e9e30b0779a8f9e019","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.85d3ccfb9e.tgz","fileCount":12,"integrity":"sha512-kFylp2IPTUHMyJdQlIKAplfaKBPuLvm0Cxy1wkGOYTAoGUiPRYsLXZ9vKIoZDmSEDllVsnoQG5/KmdXQPm7hhQ==","signatures":[{"sig":"MEQCIDB6Ycw97LSbrCuFBMFwZrhEYRIhLNey4bBlyESs2ALhAiAXPTi4u2nh1ZGgfLPUmcsXbJvfPmJR7jeeaMfSNdArXg==","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":110474,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.4\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJd3HRjCRA9TVsSAnZWagAA7AkP/39OuaYuX+Vri1RpHcXK\n/56scHOYt5V4VHsPEc4kZUhvU0YVdClsQ6/x6iRHrPoWG33o9ftyeyBmA3TD\nKQuuUwi1uR62TDp1/b3x4x7yduwQ1DEaM3cBDwVbgysdLEFzijCStPA+Rdfr\nBzLacDjV8ghJmptursEFg3Ok5yUzVxVPDoeLs/22sMsh3ZwrJkDhng8oAzhV\nf+l1dApXoPD9u1GK9rOd78FttkJaEJoG8/rWkx94FAQT9/kCpEp1iCo8rGvw\n3jxOkjpiEIN380tvOJidqpvpKiiRTS+3uUsP5zBSfAvJVvha0rHVvlWulGkp\nJUEE7Y4fD9KJwncjUq5EwgGbRjkN8LVD+6PuyMg6/DUkAta19MCKkMkhGtXT\nZksc507dXFir1YqMLop9PBndZ3O+0APzK9nWnyvhTJ82BjnPt9bo2mLzhuoQ\nVjPUqtVX9QzwYAGpI5yfAd6520KOq1dOYETLgnEDfECjpTmRNsI43b4vIPnq\nl8dglw4rkdqViCI8trIm2SYlHgQggtRXzRgY5913P9sxJNhGaWE+hljgJH1U\nG0IRQXyPByv2JIcBtFZkrj3H+E+MUa2qsKsfrSB/vYVj46nwmo06+3U6zxqL\noHhl/u/r8j9RJw3MDzzA1Cff8RA1f1tnuUfU7UvXqdeE/k8mamXDmOPnbf36\niC7B\r\n=mBuW\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/extension","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","engines":{"vscode":"^1.5.0"},"scripts":{"watch":"gulp watch-extension:merge-conflict","compile":"gulp compile-extension:merge-conflict"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","dependencies":{"vscode-nls":"^4.0.0"},"_hasShrinkwrap":false,"readmeFilename":"README.md","devDependencies":{"@types/node":"^12.11.7"},"activationEvents":["*"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.85d3ccfb9e_1574728802750_0.044553226080602526","host":"s3://npm-registry-packages"}},"0.3.0-next.615732feae":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.615732feae","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.615732feae","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"812ba218dbce1ccca2348551dce0827b5e0c285e","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.615732feae.tgz","fileCount":12,"integrity":"sha512-TIEDCR/iDbs/QdOs27ZtcUIu6cITNS9ZfTuxxbmfEAYG07ITnU4ShmoHaCipaDzACP4AqMyrOia1zxNL55j32w==","signatures":[{"sig":"MEYCIQCwLG9Obkyr/kw2H1xlCmibNoeDOssPvOPKBYE2lv6wMQIhANatL0toLTVuEKYLPt+m6hMgvCtSnNi54LffW5VqhRcA","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":110474,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.4\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJd3cXZCRA9TVsSAnZWagAAVjoP/3+vsDuVfHd415PtIVBc\nLJIv6gid6E8uODoD4T+U5wCDd8bM2ll+bzLj6Zvc6Ru3Uoc9C0iBT6MRgt+v\njiBI/I6vJ/daMK+xynwOuVq9Y3urLLqSc88iiYoffFhFYetJo00rXVeM25Md\nZQGkVHVq/oqn+joZczDk05yD1FxoCW1CtscUmsIIPd5xgiLhhF942FAmSS9P\nUhFQsrgiRq2gCf8DDX0dfYnS5zZ3t2WO/DdDYLA7HKwhXy3lgILWxIKhsHiA\ns1ZxwIFti//dL9T4c7YbeIp6ylTMzWPty653FJ5X06UnblkBR5gTc/eCRMCW\nAfDsmgPetbUszhKOc//Y2zxcgvGaB2Ut5/onj9RQUJAC93+G3Ig9o2yuMJka\nvk3JR2cdraDY4JpdS8FsS9LDddPqNZwKB63qI7VnTKo2nhBdh6d9qhQ3Iloz\noODVEUIxNH5zvF00VBWEQst3T/Y209yTqlT+osqNM91Cxu8e55CR8GNZxLYD\nDRX26PcQO4z4n5gLT6HDNZt6NyWD9aRVjVUcOfkIv/ReyDRU8yLWdq7qIKWq\nVNqRBdmzFNtiso1RIf8/osbuwVzbDTRZJxB1BMp1QUAXrmbeSLmt7Vat3psM\nZoyv4CXgr7W75B8nnEt4FNU2PzmZlyNugRQ+JnZfT8RI/pD3jeBW3RN5PynD\nooxe\r\n=fIi1\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/extension","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","engines":{"vscode":"^1.5.0"},"scripts":{"watch":"gulp watch-extension:merge-conflict","compile":"gulp compile-extension:merge-conflict"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","dependencies":{"vscode-nls":"^4.0.0"},"_hasShrinkwrap":false,"readmeFilename":"README.md","devDependencies":{"@types/node":"^12.11.7"},"activationEvents":["*"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.615732feae_1574815192628_0.5410541404012967","host":"s3://npm-registry-packages"}},"0.3.0-next.7cc88f5caa":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.7cc88f5caa","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.7cc88f5caa","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"28c3cd653eab9adab9be369ebf551aae6fed38e4","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.7cc88f5caa.tgz","fileCount":12,"integrity":"sha512-e4SPcQ+Uc+rOoLnJGE/VCrYHjM50DB2Pq8kSPhNhvNS3TUeMxXAqpg9lhXVeJQXTGN86uhZ7sSPVHnoP94WD0A==","signatures":[{"sig":"MEUCIGUf7E7AA1iKWGTWaC6WwXqZYKqyoZSFNgl/yQ18wL5pAiEAmuhAuGN+dPcr3WjJ5vd/ZjsoNDSpfxjoPBaraVUPTW4=","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":110473,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.4\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJd3xcVCRA9TVsSAnZWagAAWFUP/0oYAVyjPEuLv75SoLuH\nnOuGmnQBBZ9jk1SlLLUujDXlzQN+ffVHxBbwrv/E3g0csjF+a1wjrqNsdaPv\nO8QYxAw63hhzgg0uOYr2OjFaBblGFieeaRdC/tx510+1bTAn0Gyacgx+f6UP\n+ZQOJyzDj8n0kjv8ICKUN9Xx2M8+GBg3yW0aHDpCz2vfY288WBYfndun1X6Z\nLpDq+TMoHziRVoyKSYknLW9b3u3RrKC5xqsnbrUoHkw26cagrxmApVoEi4kG\nM/dfCwuZkP2/gKhMAcgflAj8NXKcWztqW+S1MobfPKN4YUi/YiztV9LLhrqA\nw96eawmeYnoc/efHg+/fRN4hWP92P9rRjyLcMeLHS6T/6vReShCbTVqgjIje\nan0ZEYo5MmvKeyYvYUA6ozzlYa1mtFVTOYNhd43kvLSPaLOjwy/Cw+r0f5id\nP1A/Xv9Y9KiKYSGjU0csSQX1vmjbo5UeC3XS4CuzsEGckSPg+YTinmcfXlhb\nMnUpR9LDLSAkVpBS6SHIt3nF8N7p/ebeHDC12WlZ/U7T6y0SlrVdL6scA4Y4\n3Jf3cdldUgRDGp8O3D6Hc+JrYcG2sN94Tx56lmtk5hb5aJnDG2iaYQaF0RPT\n+QpQrBRZ2Kv6ojYODKvuDmODemys4ZZYO6ez7dqyqVc1H1Oq9+Fyo+l2m4pg\nz7dZ\r\n=k5Yp\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/extension","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","engines":{"vscode":"^1.5.0"},"scripts":{"watch":"gulp watch-extension:merge-conflict","compile":"gulp compile-extension:merge-conflict"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","dependencies":{"vscode-nls":"^4.0.0"},"_hasShrinkwrap":false,"readmeFilename":"README.md","devDependencies":{"@types/node":"^12.11.7"},"activationEvents":["*"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.7cc88f5caa_1574901525111_0.36630848027555407","host":"s3://npm-registry-packages"}},"0.3.0-next.d20be77af2":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.d20be77af2","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.d20be77af2","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"73e49b7b8ac9d832fffef25a83ce120cb49414c2","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.d20be77af2.tgz","fileCount":12,"integrity":"sha512-12A9bHQoseOUBARH/L0PLnQ1ihX3JsxbIg+3sZ5FlTjiZ2wX8Qxhg3Om684k600x2hG/PCCxJsEvkt7EqCMpTA==","signatures":[{"sig":"MEUCIB+KGxwg9ELXWEm5b0GOT9zmLYNXOsCKbULXIaFR7By9AiEA8seIDzW+B//ApKfz4zsxHw0nbAi+FyMsDk62TbBiW/Q=","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":110473,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.4\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJd4GdsCRA9TVsSAnZWagAAoLkQAIjaODqsssDT4g+Ez8oI\n43k4oOfDh89AhVMZQW35zHnsDeZu22MrFNgZM4l0t0A4B7NE8lSq9xKwTsvO\nY8+ErQZPSTULexG8B3CPt64/AuKGjXG42tG7C8gnKImsGbhozWLuK+LoFhQI\n3/BgnntRCL2y3TTW9E/vP8XTIIUE6F83YWTdYjq0tr5K4E5lduzskYX4LAXh\nJLPEd7jZVD5GNSjNVJlYshcdGDHyelXZa3qJAfS4NTzBCyPKOESEEfX3wamN\n4UE2TieqKM1nZvRbJU3qOll993n2ZRkhdariZ7+4kVMfBaBEBxtG5Yh31yFO\n2Isf5X/XaqotSOb2DDbgwJVKLs4tyQTYwdQOp06qnjcZ4tfr/+OeUnlaDh5D\ntoOOt3wtf4vXthR/IvaA9jD00bcGB4HMxdxfy/HPbyG+k49peiAmL0mZxjwP\nkSt4UUsdeqBnZi1hJ/buNXEqJkq+Sp6VLVQrvujN3frusWkkPFL1/07VuuOA\n1aC7lpsdRutTy7fQOlrJJl6ACRh0ZGGSeJxez+7CNLR9s/1lmnfE9/RjGZwj\n5T4U1MFIOtj+/e0HcpWll2+TvFfwAVKK1Kc2mwq8QTK6XPTINboNvWGT2l/T\nrDkx+pc7u3tUIHyx97ut7MsEgt/ChEymqzFSSPmeCmbn2j28IA/SovVUUrIW\noCdp\r\n=UOQf\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/extension","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","engines":{"vscode":"^1.5.0"},"scripts":{"watch":"gulp watch-extension:merge-conflict","compile":"gulp compile-extension:merge-conflict"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","dependencies":{"vscode-nls":"^4.0.0"},"_hasShrinkwrap":false,"readmeFilename":"README.md","devDependencies":{"@types/node":"^12.11.7"},"activationEvents":["*"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.d20be77af2_1574987627953_0.8923447712862429","host":"s3://npm-registry-packages"}},"0.3.0-next.665b576260":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.665b576260","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.665b576260","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"20ee46988a30d6921c5190e0c6efdba36ce01b88","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.665b576260.tgz","fileCount":12,"integrity":"sha512-ReoXWdZW596G7rGMG1vJsFt+hfAIXSUaBUj3rvfkD/RRlu4C9WqOSTXvjHCdQRE6/Zsitt5DRMNE7kvF+ozYQw==","signatures":[{"sig":"MEUCIQDz1/xeifem67Wu6e6svCX2FxVFWrX/TjsLJ3NLSEYIxAIgL2LSSU1uG6yjZYaYjyAGhzAqRTDGJzTi5OuDt9eDbSo=","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":110473,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.4\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJd4blBCRA9TVsSAnZWagAAyR8P/RfHTVtbA48ZEEgXKFIt\nvLLElIahJBl9GwA9R1AXsOtKvhkByIk7RSVgdAqUqu5oBHoXRyUsI8xqHFuz\nEdi+yrDn35RkWkzapmybxixSh/paWY1yHr1d11SLsOMnMfYS3CsbXXHclw8Z\nwMg8JiJSaNKK+2BOo2DdyntuOex2d++0m+ETus4dwtGSqhe3wBr2ncQ5QHy3\ntzxvs5MXJUX4Q8JflUZguBNGIVO0nwHBg8n7WNgn5wVtc01j8H1j1+l62NSP\n4sbWWKSt0K0ZeQ3rlZUgprqg8i6+QT+oKKjwYv7YQmIldUJ5ZvJaT0oNWvO9\neGOUnPx6VKodrmRgoksodXCkaZ+eJeYHKsdlhOZCJGJYu49k9747STLLRdfz\nQYvOPF8ey2MSQ/ej0Opp9WB0dtx6dI75gao1jlV+u10C+5GK0HKfRrdQyb48\nU78kCksMgdC1M0khI4eSmx5dCM5gFD5KWsgaAQmhzJcPuQ4TqwLwOLWo31uP\n25T8Hvg+1z4tCdgZjEDZ5yw3RJvSwnCMwBrvBi47b4QXKHDp4MO2L6dz+Fqu\noIrak0CK9kru9U71jDk2qul5t5JY6Dq2vPVtSh9ge7VODbOQTJbIUbzqafbT\nWpSIRbWLWe+POotl+M8e//xSnYzHQMf8m1YDTbPUSlvDx8ckaNqbltKKQ2Hj\nqfcC\r\n=D0ul\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/extension","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","engines":{"vscode":"^1.5.0"},"scripts":{"watch":"gulp watch-extension:merge-conflict","compile":"gulp compile-extension:merge-conflict"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","dependencies":{"vscode-nls":"^4.0.0"},"_hasShrinkwrap":false,"readmeFilename":"README.md","devDependencies":{"@types/node":"^12.11.7"},"activationEvents":["*"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.665b576260_1575074112909_0.8235922235177939","host":"s3://npm-registry-packages"}},"0.3.0-next.3295e51f22":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.3295e51f22","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.3295e51f22","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"05e148a0e7e11f5e0c6bb63df2f502a3834c42ad","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.3295e51f22.tgz","fileCount":12,"integrity":"sha512-CDn3u3DdC/wZjboNf2CTmiNB5Rw6B6Tk5S4eULAMEh8coRMyfz/OES2+8YvEM9e64hSUtxUgKIA9S+Gi3Uc/Rg==","signatures":[{"sig":"MEQCIFBmn0Kzr8+ymsMjBJHOa3mpwNNxxbHM9QqIlPpt8UWwAiAPJhVuQmvu8ud85qN7OvH2nZlJHY6Mk3nt1aYmwMijwA==","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":110473,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.4\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJd4ww9CRA9TVsSAnZWagAAKgAP/2CbSfQjkxjRxFDe1WiA\njxbO+8hHkWdW64FL2vvCWoIvYCgQeAAy5tlc/faMgOSPuppsq/ur0ZzPHA+/\nM2Y9NFRIWrve/MsUM3r0VYfngOUn0ykmHWqZ0wyf5k8mseBnbJNhh/s0G6hK\nSFbd0ZoqDJlmVHyW5IsHsYg0pjf3gETH+bA0JJs0xssWSXTF8+lrTy4qSwkN\nrTL8P1i7VrkAx+MrzYwlIATbtdvH8/odcmDQunap6LqVUHnmWPttRPX8oCNr\nifJlT8RCk1c20U+MAPNeyKcIsLTBDZ2fu4QMKCkTFfM3hZDseAQafKK6603r\n9n24tEO9XpeZOvxv9Te8kUwqjbuu8bTFnpHFsS6zLuzPtbH6/hFHUYX3arba\nOoQ70XxXV5r0tTC8gqRM2WNjsIw0KIZVElkQNNRHQ+OkyUvDJdbFZA2h+06C\nbFFLoGHCba3ILOM1HWVdujiVEMWa+1gE4UYkypzubL7GK+p0vukimaSbMR0x\ntVKtv3q0gW/jioneGX7DBlm+A7PDh+DXVfju08C1GbrSF+Ul1S4/WajehLDY\nx0qsDw7ju5TgQKKRjlVCuba9YGYCIvu4f9qBddlsKt3weHi0yoQ2KpxgROzE\nu/oihRYlKlfI9QH29/i2lWflPzxf43RfvR8+s8XEVKNk9bA+Crfct+kV3EJu\neZH+\r\n=1+tx\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/extension","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","engines":{"vscode":"^1.5.0"},"scripts":{"watch":"gulp watch-extension:merge-conflict","compile":"gulp compile-extension:merge-conflict"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","dependencies":{"vscode-nls":"^4.0.0"},"_hasShrinkwrap":false,"readmeFilename":"README.md","devDependencies":{"@types/node":"^12.11.7"},"activationEvents":["*"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.3295e51f22_1575160893173_0.02548416194192571","host":"s3://npm-registry-packages"}},"0.3.0-next.7cf4cca47a":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.7cf4cca47a","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.7cf4cca47a","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"030b43f53311a171406318d78bf8ab170727500e","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.7cf4cca47a.tgz","fileCount":12,"integrity":"sha512-b4Ge2AwQvPlzS+ZOQdJwi+ziX/p8N84ZuXHE5YWF8D8t+vWuomCkTKVx9KhCu+gR+HSsHFvVhVVxoMyIG4n+Rg==","signatures":[{"sig":"MEUCIQCWObxns1vxxGlg+5VS/pipZnUE65WgmR7IMWlGfzTINQIgDg44JL0A11Fz0ALGa1DGqBZMFTBwl9GpQsNeD9MfURk=","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":110473,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.4\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJd5FziCRA9TVsSAnZWagAA608P/3WR0+r2jDwDo5F1Aimb\nMzy2pQUtQF74/cZseXCDAl0fmW2FIC5jyZvwbfBSAuIGoFZI2b5Yp/DnpJRP\nhSP8ZMSwNkOCax3T37Z3tZCDXW5YdxZOGtDftsAlrDra7y0kKAVLcvJOf5cV\nknVNCcwCWWeezHGB/fRPWfuKq/zniZtJdy6JUGoAikFIPjClhv5ma11hvEYm\nGQnTXmp6OhlbFXg98L9h7ZYhJE8vUlBOUJj5HW/I0scqcTt05KbWPaHCo2HV\n+E0YISNwpAVkFuFgpfA8JkOT0j62dr7SS4PRyWp6UEwr0I+erKLUKwlJ/9Of\ndVZPIWAVselz/EURVhr6YaqiGRsUSdx16qwz/AvZ/QBX8oLzB6bxLrCoMK4n\n7WFOJLySS5+PeXQIo4xUYpdE00rqkjhrCO7zq1G3pEQfVV9/SF4PW0xO4duc\nzGWmioEPXd3SVdCkQhAi0I2AZzpbBILbVSx//CK7Bgfb4kxD4HewxE447JKB\nFryLYsvJL5EUYKUZFQJJv7YCrkoqJ8ItuFXog7XN2dkko36Oz6v93C1Wz61v\niqed61PJ7rzb0+ZLVysMTJwD8crJ+FPpCHGAon1Y3387ZCd3vKiItbexw4D+\n5mr2smmKyPdu8jgZIbVm2+s6iCaVwK11YHIznEABIYWx104f5Jhbk8bHWnhx\nC4m/\r\n=32uM\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/extension","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","engines":{"vscode":"^1.5.0"},"scripts":{"watch":"gulp watch-extension:merge-conflict","compile":"gulp compile-extension:merge-conflict"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","dependencies":{"vscode-nls":"^4.0.0"},"_hasShrinkwrap":false,"readmeFilename":"README.md","devDependencies":{"@types/node":"^12.11.7"},"activationEvents":["*"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.7cf4cca47a_1575247074098_0.33114702254980877","host":"s3://npm-registry-packages"}},"0.3.0-next.b0fb9f17da":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.b0fb9f17da","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.b0fb9f17da","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"a6c01a0b450564ebc409f5f5d2655456364cdf46","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.b0fb9f17da.tgz","fileCount":12,"integrity":"sha512-EoSr+DI+CPhqtwGT1+/uLXnZ16jO2zR07P7kJEmsGPwhKExrf9IqtpC1tVVvNuhgDi+LiPeKp0p8Nyt4ULU8qw==","signatures":[{"sig":"MEUCIH0HHVK4k+3C96s+WwoFqbVszDPl2jhu+CKoFh3Ytu18AiEA+5pQgfoDOWn3Q7cqgZd1tvb3vP5IJuds7ooEyAuidW8=","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":110473,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.4\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJd5arrCRA9TVsSAnZWagAArogP/j8Hn4RpKqMohFTxO/YK\nlvsJWuiAf4ns6d2Gm72iaBfsUrxjAPOaMln75/MRryLv7EmuqlyEh28OZFUc\nt+TPZu6RyC59k1zG7QT0iuXWnoRsz/zSFmkMP7zGgYn2qoDgxu9cg4c1+KU/\nRjwJeR01xGQfmY0izi3ijoos38DLrFDaz/e7/PSUc5TBRIoEvDNy+dOxYMeI\n6e01rktPYn8pybUrEQ+pXdSm2ghaXtL8IGWY9NHoZ6cIoDbbrV9uObX7Mikw\nd9djTKZlhBXlRuqs2QYEWEkPioWgy4khKmZjABRt9cMNblR5vYQj7nwVg3VB\nJGgizsrsG+ZBV5NF5765x57VB2FyWoSZpxW68luipdJ6LQ8Zh1T1cH4iWwq1\nDHocovFeVH3oTA4vdTpVUaZCavjTcAfYEZB0RzgTU9tFer7a16YzDNysVvLn\nD1f4SNXbFo9x9enVjuFdpnwAcYDYJMsyVK0cLV/LdnLluW/IWBAT/56b0vsY\nrbpCEJNKhyDKB+n5o0+R9k7gtGkxNnE1/PAUZ9vCFatgYA1VKyT9s6b6Gfqr\nA9b1Y/wNw+VRpGQa24P5t/TBJVwcrMkCn3eWlyTPIMM2jNrw2Z82bEFOwLNt\ncX5+I4xtQmTN2J7dwxlAQAKuoMfAIDxBdmya6Ax/4cU5z38/vlpHuYiqPn95\njwhl\r\n=5Btd\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/extension","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","engines":{"vscode":"^1.5.0"},"scripts":{"watch":"gulp watch-extension:merge-conflict","compile":"gulp compile-extension:merge-conflict"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","dependencies":{"vscode-nls":"^4.0.0"},"_hasShrinkwrap":false,"readmeFilename":"README.md","devDependencies":{"@types/node":"^12.11.7"},"activationEvents":["*"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.b0fb9f17da_1575332587176_0.44833284768558745","host":"s3://npm-registry-packages"}},"0.3.0-next.9794f2ba37":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.9794f2ba37","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.9794f2ba37","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"76557519753b9dbf8363fc0d02b4567bc615fa60","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.9794f2ba37.tgz","fileCount":12,"integrity":"sha512-4+NcLLpbpbpYjceeTn950uwXB5w0jb7hkJAA6aXbJMyma8Y5QhqE0kQoY079y3osiuP64pzSCIuxZcnDm6A6iQ==","signatures":[{"sig":"MEUCIQC/sByqXHFtw8XPPUwuyepecYahTXWU0bpWOPeoT6ESNgIgPG/8qKI/5BYOHXefo7zTaeNacfiO7yQwxomIL/z1h14=","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":110473,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.4\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJd5vw1CRA9TVsSAnZWagAAH0UP/R2mzRZR5PMHMLKkZzOx\n+IiSIbEQGYuqo3dsT3g+M0uKgUUv17jTZm7cW6PQ0EIunYUChshc00G8KLkL\nQPmsaFqhZ1c3BkQNtI2QB+bVHFAbdMm1P5dPqf3HhuDyJ4jIdDAdmdgMPD62\ngAl3mRJawH9N05Vw6TSngAWcB3rrHnw/3vBc8jjqWEcyHXah6Pgh6khU5FLt\na8NZhp+SH+qZyXLnHetfP6KiwhEM0a8T/H9WGM147GU4aSSDAwoI4KkrcQiA\n+rzsMoEf2Jz8H2NxvpsvHGDn7DbL6T2TsaROyBWo13DGD6tK7Hu9hBGKYM39\nSHsLOW+APOJ7ABzKsjEJD7kRimL5fGvwKDsLAhC/LZ85anDvVZ9QSMNTfyPV\n9jm8tpLUzjekR0gkrVEm01PRSHX80S+K9wXKtJJk5hGseavSDM2acviESxQV\n4zJu9AV+U4R06dzfn/zfbK9by0Gpc+QRRPKy0Vhb4EB3IzEPLWRCFExAMASY\nW7LllpSKKvhwDahBeTy8IMha0zIUQtHMxuZUomJtymTc79YJ6/+YcHq9np7U\nLLq2BCvgZ2I9pim0a1UXV0NrAV+hhVg5JmNgFzel+ZLypbINZ+7Yv10Vtoz8\nXwNfosMxOivjrA3W3ur/Q5JtERs5W734XFAOeKqKtAS1SHH6y65rc1mrkAT8\nAVHa\r\n=tLaJ\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/extension","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","engines":{"vscode":"^1.5.0"},"scripts":{"watch":"gulp watch-extension:merge-conflict","compile":"gulp compile-extension:merge-conflict"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","dependencies":{"vscode-nls":"^4.0.0"},"_hasShrinkwrap":false,"readmeFilename":"README.md","devDependencies":{"@types/node":"^12.11.7"},"activationEvents":["*"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.9794f2ba37_1575418933405_0.9507044588514835","host":"s3://npm-registry-packages"}},"0.3.0-next.43e3581aa6":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.43e3581aa6","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.43e3581aa6","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"1617a30ddce76da3be64fb2521f81b825a73d514","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.43e3581aa6.tgz","fileCount":12,"integrity":"sha512-qlUEa1WD3QTrre7eKeS53TLQkln+p1qSP+Z1zQJ1fQRS/F4ijF82KXSavA8tvgZyprXIfXDV8HOueWK/8vyNlQ==","signatures":[{"sig":"MEYCIQD7IXi+wtpCCqQwKvvom0ZmqpI9yx+BXmjV0Z0DZveulgIhAIPe5644imbNrY7vif1l/Tw1/H4JrWFcmz2zj6V773Ve","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":110473,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.4\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJd52x4CRA9TVsSAnZWagAAcNAP/R31E+Dtch23ti4WYAOk\n5SKZ+vhmcJbfyS6saBLu6FcZIvGOYNx3o7zynOmSrYMUwIi6YL41vvf7Sl2c\npUv4m3new6yc1rtEW0qm99884JqS37Yt0pz7TN1Dryn0YkmiiFgd0yBzMLIP\nVwECeGS/Mcd6QT485YKjSF5NzGnHdUfbobS0g2lDYpMRoNmCVsnsUPAGWR9p\nAj0KhoqVLrLksI+a1U2Eeiat/oqNz7bEpdxI4p8WOnTAJZgwRpx2ho7TtEN2\nMq2XvmvE350N9nFOflA5ED2B+9Vut4CJywUNvtBCYX1naK3d8CIhURi2C5qT\nJ6jXLaD65a4jQ26DCfEKMq7RnLGhMG12vi2lwJO0UiJW9cuGcuznpPTCqKRq\nCAXgF4VUIHyJdVSDSDywcRLuIC9fRR2+S70Frwajq1cKmhfh1lLb0V9sRwHX\n+m093y3I6cQSy/GPqIrAzAnEM86iMAxLXNA/3RfrN8ChzbLpzMC1EXlQ2xGY\nhx55qOUIAfRIcleUZ3oRVRGvWeBwe2n9Ag7zY+pJqpTOfLSKoPyjmAhUcvld\nfUFObfJFeRdvKFIpj4QI9xcaecnTWwRwknVqUUH3sD/QCaI/7pUDnJ4DnhCJ\nTzAphDd9+5KcRNhCUgMbxOTEFFxBUUm6YQJ5Ytc+Q1A6bbG5Lbrc0rTVBuSA\n/t0E\r\n=+TQj\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/extension","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","engines":{"vscode":"^1.5.0"},"scripts":{"watch":"gulp watch-extension:merge-conflict","compile":"gulp compile-extension:merge-conflict"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","dependencies":{"vscode-nls":"^4.0.0"},"_hasShrinkwrap":false,"readmeFilename":"README.md","devDependencies":{"@types/node":"^12.11.7"},"activationEvents":["*"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.43e3581aa6_1575447672474_0.9310444289551025","host":"s3://npm-registry-packages"}},"0.3.0-next.2111655b67":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.2111655b67","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.2111655b67","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"f05c084ad54d09b21d0b03ecaf64157ffe4fa47a","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.2111655b67.tgz","fileCount":12,"integrity":"sha512-EXRW4IezN1aW2OyOMSp5UzVoVBCpdd9ErB95gZKQvlRfiPZkyNJton0UzmylV9qPnPMTL13De9BeX6FkoFpQGA==","signatures":[{"sig":"MEYCIQDRPRAL9e+RYtselbXpTYLQ+kkyVWOsdJEeU6LP9d2X3QIhAIZYzhAR8FGVtK83EQUCDHKX0wBllwEg+4he7+gNEaMZ","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":110473,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.4\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJd53dtCRA9TVsSAnZWagAA51kP/jNseZJeEi7TqUyUf4zE\nAlFjtmfudF+ewFvPUXYPS7bufp/SSgCKQRGyNljgBQdhPblx4PeZUCzXLd8O\nkp6OySHOqHK/XGcLI/I5coH55mQMwBYTTFEJQzoPNJQPNyEJc0jUdfQ6jzZ4\nkf0PDvj53oqfne6OEmU9O3vDEpQKcY/b94tS2aL8YjegmKHMIIaSRbvwk56a\n23SAyWjLW36reZU+tTX63KKWw/o61a1Vt36JGb2yX7VUv8YYkHdOmLfaNIRY\nWX/+joadPEpYjWMvTqP0lvFq5ReMFl6VD3h5pWGV6ZK4mOlG7+AErYJn+ShT\nmQf0EtHP0gFuTH+Vxqr6DveugLLLD2Id7lW5vv+eANGQDRPDlkG/BydPKZI3\n/deSfoP0TTXHsgeHUfuI5Pfn3EdhS/clbmH0pfxZrz7+GOYi/Dz8pRMO8cUH\nHzj5RM3E5ugi+o+kn6DF/7dUCXEzqrb1J1jsl5Vx0Ff5P9GTNalv2IT8aXg3\nFnLnoT9u5lVEt4HAkEVEX7TmLIr6Q4LZyn27sgQn808Y3fEcESUMGwOJbe5V\npwHPPXEtK7JtskIXv7mvbRdgUo8basKriXWuWHaPpXbQPl9bcjxuszTar7RW\ny1KD9wPhgGg9WZbtdc8uYZqyxpMgpBD+LPN6ZM3VZdY6PGGebRXboNPX8Kqr\nZhCp\r\n=SVSU\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/extension","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","engines":{"vscode":"^1.5.0"},"scripts":{"watch":"gulp watch-extension:merge-conflict","compile":"gulp compile-extension:merge-conflict"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","dependencies":{"vscode-nls":"^4.0.0"},"_hasShrinkwrap":false,"readmeFilename":"README.md","devDependencies":{"@types/node":"^12.11.7"},"activationEvents":["*"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.2111655b67_1575450477184_0.13809231257483545","host":"s3://npm-registry-packages"}},"0.3.0-next.196aeda027":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.196aeda027","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.196aeda027","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"feaf645e6496bee19769c309796b2e4a4b5efe10","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.196aeda027.tgz","fileCount":12,"integrity":"sha512-q+ulC8l8m2434f11/fZFepO7K24ZNo1o+F3rUoIZAEy+2wlcUweCHguYAZQ7pGUTlBUJrlXn5QCCdEtP1RhwPQ==","signatures":[{"sig":"MEYCIQDoA7g3CLESgO/Rt0Z66Ph53MYDs2iBGIvdVfPsikqKHwIhAN5cc0PIpJoQiIV5oIqYTOTeKqRH9fhooSUY6N5JLzq4","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":110473,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.4\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJd6Z8NCRA9TVsSAnZWagAAY6IP/16L/MWWjJ/UikpLkE3N\nj+BQFevrlky495MhwZOisd2X0Cpo20a1608g3ieD4JE+5fw2gG/uK6/9KBAL\nqO+jfWK4g7xWkfAGvPAtfivQ4EEez4upa+jVO2Z1C/SQrKkU1ykkO/p5bgSW\ngKd0qk2HO3uJmL+dWqLSQyvteMb0CG4BBRaC8Bf3egQIbU+DEYyk/bsl23a8\nZtCLvKF2O5wz4dIEoyrBLrgwicF2gcvV6gnVXi+WwPmzjIVCWXfM9lP/i84h\n/iqt+lbYYpNTiJ2hmw+r23q9PIlNdycNy5wOcbCeyFyr6N2T1gmz6/saB8oj\nsFZK8CDc9J0U17gzFlHCmtKBBDlsmYSfiFArEzbu+57vgDRH2sBts+KYUUn6\nJHeQpctsbHkmsO7o0m2Tcj4zn6k1J63iMF75Lqb0kOCyrb/z4EZ773YjCUAr\nuCf4y03OtURZRpOmhm4C97/ehtfyrwVxuwuJsL2GeUu8plyIWon05cNPtt6f\nI8SPata0MhxirYST2CqjDZKUPbJFTk28M95j4qGcVwt9QBJHdfXk7COaSo4f\nvpP/wtI3LJllQG0MBtLmErCG9ENWYutApzaIGaRXkW0Pw8lBsCyytyPywMy1\nec1kZrZB/2XUjQJoJvIOccyI0wHixW1qXxmtmO0W52EBO8DgM05F5Hgms3Se\n18Wk\r\n=rrNV\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/extension","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","engines":{"vscode":"^1.5.0"},"scripts":{"watch":"gulp watch-extension:merge-conflict","compile":"gulp compile-extension:merge-conflict"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","dependencies":{"vscode-nls":"^4.0.0"},"_hasShrinkwrap":false,"readmeFilename":"README.md","devDependencies":{"@types/node":"^12.11.7"},"activationEvents":["*"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.196aeda027_1575591692794_0.24189598763445264","host":"s3://npm-registry-packages"}},"0.3.0-next.a416c77e56":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.a416c77e56","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.a416c77e56","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"456d688b3df6fbe438878c70258770ae92002bcb","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.a416c77e56.tgz","fileCount":12,"integrity":"sha512-20hisMUbX3sBVteuLtj0Sn2WFnN2GsyT88tWSuJOQ0kM6y0jk2NuSiuckZZc8AbbNjeBL6kK20UrEvIwkIhfyQ==","signatures":[{"sig":"MEYCIQCqnwJNMpnFn0VB67E4e94UiG6RfBmu7HyR6i6GMyPyPAIhAMDgbEN49rPxAYsvE4gAM1OsoWAFN3Us4rKMWQ2jTizs","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":110473,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.4\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJd6vC/CRA9TVsSAnZWagAAZ8EQAIvbIe1JvRMUxyZ3+poc\nphon7g5gFHMU3wcnhAefszpJe6cFJuu6weZMpY6NvcpRAuFdswOPxbj3eEOE\n1hKdhOUlsTDigDkQtYIpv9TWa9HyNTc5lOjn/pyM7tqABy/UTWTD6cr8CkAg\nib9OA+CWa+dNl+h4H7xB4F2vF6GHzd5F+aVqBjIfkbaTFpmTBETpAJsJK/FN\nRw34hb7EV1k1OVmETdEyLTyvF2Gr0CtX4pcdlah3g0oRO1LOs1gUL6KWlWzX\nMFSX0jG1L6rtHul9qDDqdsBR1TGAZwWuE2nT3IFH4lZGL+KesumK5MbA6RMn\nJtVvewf9s5djTzgoK+xcrayM7bdZfLLOxmFOOpoCZi18/5UT10mIYSf1UzFE\nGh/xOan64f7fkaZUPqb0HCOhrC0NrlMhrrRWex9hkmv/TTanwPplfo5We1QZ\naLe+bUTwuBKQvjL0dJ7HC0bOHwstQZmjumMZojE0uH5sdh9YwKVvttZE7UaS\nE+iSEWDKgSxMmZ0UEbrg/cjrcRUdyUzAnaPc53/fpWvVV1hM0HuR/dRbn9U/\ncBM0FMRnNSiA6XxfHnfpSX6ZQrg98LGuo75YkH+L23hVsdDAkitLy4tN5WpS\nvgLHa+dUDwn8Vs6wQnUwG+aTydRRKL2TL31R5T6xO2vYsV+nAcf9ACnh0bMN\nwd4b\r\n=Rjaz\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/extension","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","engines":{"vscode":"^1.5.0"},"scripts":{"watch":"gulp watch-extension:merge-conflict","compile":"gulp compile-extension:merge-conflict"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","dependencies":{"vscode-nls":"^4.0.0"},"_hasShrinkwrap":false,"readmeFilename":"README.md","devDependencies":{"@types/node":"^12.11.7"},"activationEvents":["*"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.a416c77e56_1575678142844_0.6958627658921308","host":"s3://npm-registry-packages"}},"0.3.0-next.2bb6cfc16a":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.2bb6cfc16a","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.2bb6cfc16a","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"1bb77b4f6abf39faa49d63a38108ea1fc377d836","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.2bb6cfc16a.tgz","fileCount":12,"integrity":"sha512-fx+GSKSvf4Mhfu7Ws+JBV4fHQnVsxV9iigr64SbcEzPDaue7AkT6n/PMR5cEIqvLEH/JpzTJlM6UC0dPm2Jx1A==","signatures":[{"sig":"MEUCIQCmxlFdREOR5f6pae5EjpMYsyIJF0yZZDlBYpEcPJzrwAIgY6TDraSqZBI44xaOryI727pA5nmq4lnvZ5tJH6gyiu8=","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":110473,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.4\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJd7EJ4CRA9TVsSAnZWagAAuDgQAJilHbJqkJmfd2y7onQR\nY9EWk1JqvHzMyHSb5v4kJ5gFgI9r51qQSIJvrGLPCg6HaiRdkxvKx8y541V3\nRCgeC2VrsIs6NzdJrc9M2knPWRZYlExTkRMHw1KGSwpCKzNFo3RUHQ0icQgq\nROuuSudeYRUb0mYE0elzf+sKjHOE1G/dOJBBlTVyR26rCUhfXPbupHaZRmNj\nuTwzf02h75ljDZ5hOQ22nD5YwoFsLoSwfv4dBJaqDoVj9dThbRYpf1X5ZiR7\nHf/1Kuj0I3NWzNc6lCFBucEu+djepK2awRE5Yt8ro4cMXtdfMiOw8veRDsgd\ne5lR8kQHsy3ROTv0z6Xa7IVplN4YGWDOEhhJ5Xx3t2HEblwr64ZIVPeRuQXG\n9SioloONhKjBu4+OnItL+YgW/2hDGLuuhOF+Rh1pJvvnvpr8XQsM2U2jMVhz\ncjzk1BsVKlmzPDzby/hecBRa0xKoM0KcQxHo8yRk9N7pUjE2bTUzMGd1OhGH\nV9GRm0UKgYsOrEyy9s+aU3LhbYYNj2vatMBR/BBisaYLm1DtZ+NyzikBdSoC\n9/YzJJtLAFvMhnlbaLum2mRr4ulj8fDl4YU0OvmlIBmIfrqW7qWZKRQMt4vU\njPKTrjkCmyEGhAkd/gx9qg52fl/YDIBneg8duRdDrI2OD3vU9qjcrD7IPZnY\nxMw7\r\n=4cxe\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/extension","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","engines":{"vscode":"^1.5.0"},"scripts":{"watch":"gulp watch-extension:merge-conflict","compile":"gulp compile-extension:merge-conflict"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","dependencies":{"vscode-nls":"^4.0.0"},"_hasShrinkwrap":false,"readmeFilename":"README.md","devDependencies":{"@types/node":"^12.11.7"},"activationEvents":["*"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.2bb6cfc16a_1575764599639_0.13009774574072464","host":"s3://npm-registry-packages"}},"0.3.0-next.cabcace4b5":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.cabcace4b5","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.cabcace4b5","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"5946d85c354e28443315eb3ce7c4d4985ec2807f","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.cabcace4b5.tgz","fileCount":12,"integrity":"sha512-C8EvsUbudB/RNhLT9ZqcaweyvZLruvOhuJk3yQnwSKbZKYsxykuxyn7+lkq7MKh9HNF4TiPHPt2L5b/QgDA09Q==","signatures":[{"sig":"MEUCIAHDfowbWQOTvmtBiZ8kkoLW6oCxOpOaOhUtZfRA6vunAiEA1N4hFBCKnOokWHkdLtekTTxEIhvn+JJkmuQLYpQC+gM=","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":110473,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.4\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJd7uVOCRA9TVsSAnZWagAAveAP/iyfPWcy+dCIhEUS5Jso\nLfR58uvrJL4sh5vo6bOJBfLZ8xoWt7Nv/rA00r4c7WD1tidSLvUtPtTEOf7d\nCsGCUJEEN4itKkf2LWWcagwrctmpvN4+GyGUxYijerzOB3TqvFT+ePcSOYsu\n72+AJhXteJxwS6s0475W2mfqfZ8iBk3qhlPDNGXoNpe5/mWtzDZ1kv3Z5ThS\nMXbSWwSckerHK1Xv3s6nnt5kg0lz17lkopG2M6ComvbFwoXMMIdBa80PV2yx\nr2ctm7DSD+MK8fx04K98BcNJd6sbN5zQmZT84ukyOdTIEjx3LUAlzF4ra6T1\n0MNtRxEMHykjxtUyuNf1HVPyIxo7FZG4IWkP50suX6FQJ3u/PLR67aK/mBNF\nS4glYgj3L7aDLL0il2wIJYROqNkT6W6ftQ4e9sQJReMweMTJKL+aWHZFJzGK\nKaA6kjYoH0fnr+NzWDgnXtbMTR0FOcg380JvBePeMD5Eke7T5G6gQ/Od4NV0\nfzKMhGB3E8I61U2ypl2D+k8Rga0S19aRZEslVvCuP+PZemaGgZXjT2jafw8d\n6K9BBd8dt2q1EmGD1rCk3hs839jV7wGWVwy55gW2CQDjylidyNF3g7l4/ZHX\nfbDW0DLKHF3sJMhemqXYZgQ9LR5zrPDUmzp1+JRmKouMxs1k4+Lvf1ATVhQs\nC7af\r\n=uMx8\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/extension","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","engines":{"vscode":"^1.5.0"},"scripts":{"watch":"gulp watch-extension:merge-conflict","compile":"gulp compile-extension:merge-conflict"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","dependencies":{"vscode-nls":"^4.0.0"},"_hasShrinkwrap":false,"readmeFilename":"README.md","devDependencies":{"@types/node":"^12.11.7"},"activationEvents":["*"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.cabcace4b5_1575937357884_0.8020525382748211","host":"s3://npm-registry-packages"}},"0.3.0-next.b099d570ed":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.b099d570ed","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.b099d570ed","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"a416521218c5b61bdc078fc4548821d603d14d34","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.b099d570ed.tgz","fileCount":12,"integrity":"sha512-47UNOyENy9WSmhotdFqSryuTD8aAptwH/KOLspx+1Uhsr9YV8n+PkggULD/dOp9+8Sqtr2gu1a3rLx4toCwVgw==","signatures":[{"sig":"MEYCIQCy5QzQJrJbxXVLmC+R9DBFflEOuzxuHux9Jt3gZD0t9AIhAPtyUkXbJAQc1eMSysyPzWbhQIpiBuw7se/nac0Sg9Ww","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":110473,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.4\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJd8DagCRA9TVsSAnZWagAAza0P/2KNKCIkMOe8CrXavOu6\nnJOyEAN7ttw6fQt252ZeW4ImVtsTnZKgqdmjTeyFd9LL+pKz4d1V4K8x9rBm\nwmFYciREnsx89/KCJVtLYEg692l+3e1aQ6aB5NqmCQJNiHOubZYJl50Q4uxa\nu4inLA3XhmffBtqF/70loV0yLSkpepqV8lQmeWXzZk/axewk9ZDgNAxKpPwn\nS7YRX0ZKp9hvSU5sDydCXJAkfZTUHOu5R9yizzEFmFjeWrGQeAlzg/Bp1xfH\n0ebKnoR4wG4U3X02eXNwiV+257gJT3AnQUtv2wiOt5/kX4T0OGtnHMR+Gu6d\nQOJjc1Y2pC0cgUV202+seEPxuJjBpg3e4fm6spleCTLfTfXjvmLrFixiHY+g\ncV7LCr1bYxmCo8YMvL7DpSFND1E0wW0c8nthYuEyM09nYGT2nTsFGDbulMyX\nh4uPFa++RIP1hnj56ix+ZVcYZTSScmpFnQsOK1kCMXAELrSqs0N0xmx5hO2t\nzrw+Nz0Afp4jy6QRGh5YOc5r0wiTuLQJ7EOFL5cxQ2Kg/Mo46/0mqY3vrTEh\nXoJAOVoRWKI50pkr3ZZg9fBGaZyrMXXCmyg+oBnJ5TyKTpPnFVMsxNdf6kF5\nCkrYvh0HLh6rKJY1uiJE+a1GXyf8lOvh5MFEotyAMKC1c6k/13qu0CG41rgZ\nwln9\r\n=GefJ\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/extension","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","engines":{"vscode":"^1.5.0"},"scripts":{"watch":"gulp watch-extension:merge-conflict","compile":"gulp compile-extension:merge-conflict"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","dependencies":{"vscode-nls":"^4.0.0"},"_hasShrinkwrap":false,"readmeFilename":"README.md","devDependencies":{"@types/node":"^12.11.7"},"activationEvents":["*"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.b099d570ed_1576023711606_0.7915818530840486","host":"s3://npm-registry-packages"}},"0.3.0-next.68db7fc3f7":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.68db7fc3f7","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.68db7fc3f7","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"aa061e1fb6ed93de1896046322e01cdc032c40d9","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.68db7fc3f7.tgz","fileCount":12,"integrity":"sha512-6MFMhI41/nop9Od1cwc95iYe3/5coLE+bQAaXdJSbVh1ALiU3vg4ahuqrIxg0nzto7r2H1uXt43Lvs0kFdHtVA==","signatures":[{"sig":"MEYCIQD2pqOOhVC94KJ9S8cxm/5voQ6Z+ZJxBYVrdRaCKfxPMAIhAN6hFr1CX7qC7HrClcoRHLG0D3KMla+TUapcQgNuCzPs","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":110473,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.4\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJd8R2ACRA9TVsSAnZWagAAypoP/jSIU0AGWZ3PdWWjRTeq\nMHB85g9W5WCnFcozKYYNQbULhlVTL+ktF8O5hq/rKNjhYsfm2Ngg2xpNMK19\n0ycB5u7wjaOWLPKdqu2OmH3UW7sjcWvS51TdurRSPqGTHFYrN1HnGxCIWyHd\njmLewED2WNb8K9V3AvQLqBH4LRZhfOP6n+SEvwJNvjMnzSYS/JDqamKczyGx\nUyWfQmc1ZKiSxI4uZmyDNfamCqQSzmBjpwlLhjyh0RxOzm7i2fEd+sc28UdE\nAVb00ToB/TtUJ+ZPPCA0acuKLAiQcXv/JGGi2xC5qoPWJms1PdquW5BTuF6q\n7e8PZg/7WlKAfIXAfkco9u6weyEglCxOv33pl4k538lENCsVDMiItIeMokTX\n7ve6ymYFWRtTSh9k8AXiD0NL9cq46R31Cf2K5woImuuuk+sV/7zeJOus1SZp\nqGMafHh8/+xdKS6Oop1Vo7uakHklwK0pP4Ia0Pf9pOMB6B0B7TZlbQ7Fv/vb\n85TWhR2d6DQfXIqFOgs2OpYjL5dRY187O5GjJugYkB5My15W3+nNtqO4iZc2\nXh2ZNQqiEgO089yCBw7Tcqfxn3HyDXEioPQKn7aI40+m6KZSNLAPsIy77KGh\nrt5cunkaHSZ8+9YLx4rs1XRlyQedrvGALAQtd0pVyKYu5auw4zz0ND2f/bza\n9p+T\r\n=4fIU\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/extension","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","engines":{"vscode":"^1.5.0"},"scripts":{"watch":"gulp watch-extension:merge-conflict","compile":"gulp compile-extension:merge-conflict"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","dependencies":{"vscode-nls":"^4.0.0"},"_hasShrinkwrap":false,"readmeFilename":"README.md","devDependencies":{"@types/node":"^12.11.7"},"activationEvents":["*"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.68db7fc3f7_1576082815747_0.9654628625007171","host":"s3://npm-registry-packages"}},"0.3.0-next.007b3032ad":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.007b3032ad","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.007b3032ad","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"d9f55ccbd624c95f2cb346c9f2d212c4c99c2512","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.007b3032ad.tgz","fileCount":12,"integrity":"sha512-OhnKRw58sBGbeLdTA/8KQjEpKmoZJrToAv3WmLyCBfqRpC5EDJ+DvN/NKJuNAoaNk5Nx7bww23u3c3WSSQvd6g==","signatures":[{"sig":"MEQCICbZviEosySuvXBVA1b/uj99t91vADnM7XjysWrN8Wr4AiBr0hXJZ4bguY7Wfb8mMN3UMUBk4iUeMGSmSvAp7rdAyA==","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":110473,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.4\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJd8YhkCRA9TVsSAnZWagAADswP+wVTE5Ctjjmk2a7UvzCv\n3VTJ7Hi94HP4ki8Ta2Jvtl9yImLZDc6qxnoR0aOk/UXR1bc7JpSjKLjHXeoN\nNt0GjEe2QrIPgR8VFbxCbh3SQvBgr9tfhy2ISQbaotNmR/KUvYbv9oCSYOAg\nqt3r9zuYsyxO56cnVWG4mlRH7K7BZJpf/jtyMyBB1Ijg33xb+QlxR5Rq821E\n8PbpNgpsS1MDHVU+WoThuqY7GqhLdjHWq0hDY8Hp5z3ATJbiErKSIUw5MhME\nayHP/UIu2Qr/679aWJz4xHYPXYaTOeLp4WtLJk370+5vISjhlkKnXneDLdzL\nOYpR7pjpLi+Pen3JoH5Wpu4ttAHX9/7c88yHJTjJpVwH/+/hqxD4RFUxae7l\nksaIe52BJld0wAA8ih+lQPlQTATk9Mmhm+pkh0HiTtRGJzsyQ5UhyLFxUtOq\nPwha6O7NRA4HVCB7bJkTplijJzYU8y/580ptiNw6oSc5JlmYIEhY9TL9BAiK\n5BcYnyv4EIg88ZmOS2kCNe91+4SFG0wlbivpQionHU9sqbdlDBwxxsT3eqWx\nRKyFHK5RoM68DXgWimB5dZI5twCv/uV91jctqqRXuO3yi4zATmF52tPy2Knc\nRU4KAmoMZkHcbp1TNe22OxOt+x3bsPc5UW9NORR2dddwv3JN7n6DouiLT+Ge\nFaby\r\n=LEgI\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/extension","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","engines":{"vscode":"^1.5.0"},"scripts":{"watch":"gulp watch-extension:merge-conflict","compile":"gulp compile-extension:merge-conflict"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","dependencies":{"vscode-nls":"^4.0.0"},"_hasShrinkwrap":false,"readmeFilename":"README.md","devDependencies":{"@types/node":"^12.11.7"},"activationEvents":["*"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.007b3032ad_1576110179776_0.7343379162928865","host":"s3://npm-registry-packages"}},"0.3.0-next.b34da611b9":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.b34da611b9","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.b34da611b9","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"4ffc8a3b45d777243e8540a543b2ac5762b73758","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.b34da611b9.tgz","fileCount":12,"integrity":"sha512-HpJdxcCaVL0NZuPQnR71UQKyQEE3x8MOTy/MkDJohvFSS1h0gl4ddIZKSweTv7zNijhmzhPF3HeYYfJxgYCIwg==","signatures":[{"sig":"MEUCIAehLU+Xc+r387VZMxn8/fi2xWykamodDABhk2uqrm77AiEAu9zuqUzo8ceH+3COwdTyHGnJMfoFHAGfDA+pmqsXp0o=","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":110473,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.4\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJd8i4ECRA9TVsSAnZWagAAbLUP/0HoejZrgn2pKv6Cw7rZ\ntU5B25bJ1TBOcKuAaUHVcuwW0yuNJ3FXkVj+a4xr00VlnB3F7aCsfSpB9k3A\nvOlH68DYAmIO7cmG0nB2LqBmwY7fe43uXJfgWnaZ9PluWiDAfrrWzz8Owaib\npdClswY8ylTJiSVTWF+Ua3KIeD48hUpp4/qUaNJGGf8/u9mwo0n5F+mK1Kez\nvMxHHzEuuYewRjJ8X2RlD6gVJlpTW2nQvLXRmJDCEUWx7fC6VBJffP9YKWe7\n0yyvm2tT4LMc83aPmc16+5XnHcYZRv03W4SDQhGp6HfFwpDRMqXLv6i/E6um\nTDzVkEL35UrYsAjwVZMccc+pNPgb0Fsf5u2drrRy38mX11+VY5/j60HCtd+B\nzWheMzu1jtlkzH3yUqdrLmEtRMtXq+E4tzKFFdsfD4F7OyRX0WpFwVpsD+iP\n3LZc3jKqTbeOW+rCVLMoBQTJWPHLSb1WhE6aXXbsoBgkf49qqqhwezk2frJe\nHXHR8XEz5iRktUMRXvuzCGnkz1hj8dfjBU7ZejVzXJnjBv/w8yohfIaXRhx0\na59ciHIZdJHRlqMehKJDrA0+Mh6iAcnUXNchiHGiOkWsYjEPKuKtF78Qmn2J\nKq/pC/LYC1zJ6vgrhkPSkiOFQ2MUjOgu8RGSGqNA7t+WF71+HIYoCjB6yJmQ\ne0+r\r\n=i+7e\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/extension","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","engines":{"vscode":"^1.5.0"},"scripts":{"watch":"gulp watch-extension:merge-conflict","compile":"gulp compile-extension:merge-conflict"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","dependencies":{"vscode-nls":"^4.0.0"},"_hasShrinkwrap":false,"readmeFilename":"README.md","devDependencies":{"@types/node":"^12.11.7"},"activationEvents":["*"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.b34da611b9_1576152580481_0.060208625250366854","host":"s3://npm-registry-packages"}},"0.3.0-next.608ac23340":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.608ac23340","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.608ac23340","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"75f9b463244d8608354b9da0517b667ef39519e8","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.608ac23340.tgz","fileCount":12,"integrity":"sha512-jUTOPvMxBUfZP2+4G9+9JiS5w621Ro0rHAymy5sK1jxAkp/aeUq4kQDBYQkpoR+SmVDAexjTTENcRlF2G1t5Sw==","signatures":[{"sig":"MEUCIBqaFYLsdRp2O4h/oU48SnFrIOAEmyDE3G/64FlCW008AiEArhxXzZcvo8vfvbf8wypTx2dVyqeFAzS8FqxB06VZBQk=","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":110473,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.4\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJd8tnOCRA9TVsSAnZWagAAz90P/1VKzrKKj0KvXhcCkOiX\njfJT6qbWQH2lYnztjFVmHG5cj5MaNhQPxBQ13FD3/pKbCp1vtTVn4Q2FUvjz\nRs/zo/r4MHZdij7zmanx8VWepqj/yrz4FNvkgD6Hyhd8xLPsC6x1ppstzsDp\nWKpx2Gg/uUg69LeCwEeB3WeFyNwelHv/gVSX0ytHqyht+bzJdXezI+qV1OVe\nstwhDO7mPHihdUWx41Sd/giq9f+m9QU+4tmUQOnFPe++rNivoG7bBemCyTFq\n6uaUL4ydPU5RXTl6DdqiuzJCp6vUWep6IW8m7P6ke/Hi4WhqpOp1dn8yqTSk\nllH/m2Kmg90bO3ykgjo6bYAu2aiRxN3WDgH69RRk9eRARa4JDoLhcWM3AAPW\nkcakTWheV5nNoTb2VlDcTKWR3BxrcpICDozB6yrSnjiTAxQy4rjPjoFE+9av\nKqrrgaSJ6n2cYjTj4+BACBKUzZ5lZHi+ydC351mUP6FssiDQxXp/PHxXEK67\nojl3uPKl/7dobpsXwbwvhy1UoBARzVL6ygsVtFbWK1BoKGLHc+qbfO2+XsTB\nPbu9iVXfxKnyBJKge+1R04rdHJouuOOEj5IDd/QAr7VKntkKh7h2JjdxnFY0\n2PBW8IeqE9X8slyoQ4aM/z9atqpJAMefn3sxoe0t4jtMyCYfA9qZelBBByMA\ntJj6\r\n=j33g\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/extension","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","engines":{"vscode":"^1.5.0"},"scripts":{"watch":"gulp watch-extension:merge-conflict","compile":"gulp compile-extension:merge-conflict"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","dependencies":{"vscode-nls":"^4.0.0"},"_hasShrinkwrap":false,"readmeFilename":"README.md","devDependencies":{"@types/node":"^12.11.7"},"activationEvents":["*"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.608ac23340_1576196557883_0.5913439112056247","host":"s3://npm-registry-packages"}},"0.3.0-next.df57a6157c":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.df57a6157c","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.df57a6157c","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"0448843cd870d4cce3990c25e50ae0f9119f4104","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.df57a6157c.tgz","fileCount":12,"integrity":"sha512-TLz+8R5O7KvUZABEqHV1phgFggOFlrLTzMkGN4VUHQM+rmXObVIR8WE55RXzQj1433/MnDpA2zUGOx3dpwh1xA==","signatures":[{"sig":"MEYCIQDfgClw1kEIyxts/ZtLlQ9QSFc0WQgi3Mbkcc4H75/yNAIhANa4YxKMeErztooPYXWpQU/k+0Dfint3xeFEceGqUwAH","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":110473,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.4\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJd9CtLCRA9TVsSAnZWagAAOkQP/1BVur7JFJORwmKUvfzD\ntOCx1qD+Iv6WJ81EU6ij08MJ0lfM7dAP4+xtClg/AyBW4VqBqls30aLFwQK4\nK60khUlmQSZZO9wqA6cMunvwoSulVdy2Dxytz7OWdtxehlwx7DcarLYBpgmp\nbOekUQi8HuidbydVZ5WjmAiqho8xMTJR1iynI2ncMo1loGhqLq/EknVCrOUc\ngvC46wKBWWZiudh35EukNFsOuZe9MgQ1qErs7HY03OeB9Q7a3TzK+3BNMK82\nZJRhvyacnhtoVbe6MqFtxZ17dkxq5uNZd9hc0F8kdojtq4yEU6hKUCJ0CfXD\nw5wwte1PlG9Bf6WAbJV7CbOiulwAt86VRleEQJK3xbOzXONsT2qzX21wLEO/\nkHTH1bzcQZLyN+xtjjvaozWSXbympg74krcwwDBwh7zHcJaYoZ8W1AytIZxI\nnhQNljFNWYfd71VT5leJiYIFOuvPfEJ69edP7sgrVfB1CjZfUibxunmB9XpP\nMaMMV1tjmJhXrCWliZ5uHs+Nj0fFQlj4uP3zqCSzJuft41mvdd+RZa4X8g8l\n4c9kMfagPnjNKdT4PrUuOiAG2kmKcZbnQ6B2Wr8dv33OdjyeNcrPvGW7X1rE\ndvuNcYwhuqZ4tOqP1gxC7AsM8rkLWDtQTiXntGER74G2Pua8WbiQv9wg9jfW\n2RHU\r\n=Rv9G\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/extension","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","engines":{"vscode":"^1.5.0"},"scripts":{"watch":"gulp watch-extension:merge-conflict","compile":"gulp compile-extension:merge-conflict"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","dependencies":{"vscode-nls":"^4.0.0"},"_hasShrinkwrap":false,"readmeFilename":"README.md","devDependencies":{"@types/node":"^12.11.7"},"activationEvents":["*"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.df57a6157c_1576282955494_0.9278322654292752","host":"s3://npm-registry-packages"}},"0.3.0-next.3dea65ba1b":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.3dea65ba1b","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.3dea65ba1b","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"437963243540c4f8044438b6c4001c3cbb7e000f","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.3dea65ba1b.tgz","fileCount":12,"integrity":"sha512-xNl692RgLlb0FtQYIWjzAHcLnp41pTcrSgPxXU9qLvadjULJUrtOL0x6MS91PynREdYq3b2eAsCZJfbPETKdVw==","signatures":[{"sig":"MEUCIQDKwEBR8jzHCGVIDUpgl/F/+mqbcQ7NQCdwoaDDz+fEmAIgULQpIeV/H9/6KxHdxEmug5Y5lwl3Pxe2B5w3iTLK1RQ=","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":110473,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.4\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJd9XzRCRA9TVsSAnZWagAAIFYP/RRYKOXTTCOWDoeFX9m6\nKkwrulQMUwUDDQxs+e7vGPfRMobsPsmLinot24fkZyrWJfbUDGt6TbApAojB\nfwBp1zlqqU98kcj4R5U1fmdImFVGAPIcihQit3E+IE512FDqt1Y2oL8Nu7U5\nZM5YD1h6xAutXho8Pp1zw2ZHJbPthKVrCQh0sNPtu4P5GSfxhc/pKaFfDkgD\naD3L1B28rv1UBXQxWL4E/MMpAmwWuUIzggKsISoOFXiayN+b4q7viwsNoO4s\nme5AtRr6vcKiZf3NrsR2xaCCFOlSrGZpTnHs1AuNJEbgmp+01Q2zAu9eS+So\nlfGdS11Edb/M51RTO7hrn0rsOBj0i79cHsnfXNGowC7bmiEK6tMfG+QQY8k1\nljN/+DtFbZsPf8zuEhCcRZOoiuTYJW/mtCyM773GS1+WS2vZXHiucLgn5YRo\nH5U6AnNLS3+rYRyIHfvq4sUkb6uoJZOXNhAOw1348qxanCUZ2UIvZAUQ4sT/\nMp3fVttKpQes/QS+fgxrHyLhakXIAEY+/LSYd6qfByOa66/jl3tEpKYXwfkZ\nsVpZF33iKrWmpvpaXpO+aAs3Ui28LmA0rsXTBxCanYE+DjIh/y/B/narSTmT\nAuf9/FdZlL18/YSWrCRY7eYrh2op7KcmRwRRNIM7WtWtZ3MiA4GcUagbmgCF\nw5FC\r\n=YPNX\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/extension","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","engines":{"vscode":"^1.5.0"},"scripts":{"watch":"gulp watch-extension:merge-conflict","compile":"gulp compile-extension:merge-conflict"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","dependencies":{"vscode-nls":"^4.0.0"},"_hasShrinkwrap":false,"readmeFilename":"README.md","devDependencies":{"@types/node":"^12.11.7"},"activationEvents":["*"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.3dea65ba1b_1576369361459_0.28688788024612855","host":"s3://npm-registry-packages"}},"0.3.0-next.231c6e7762":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.231c6e7762","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.231c6e7762","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"df8bb00ad5161fa05374359585a104e35bd45e30","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.231c6e7762.tgz","fileCount":12,"integrity":"sha512-i3b/4ApvP++qavktehnH8396RHEN8TLTYrTMPF6xst0HjjYo0huFm0IUuE2aBL4vciR8/KuDrV9x9FUGcXzOzA==","signatures":[{"sig":"MEUCIQCPhJrI0u+dSOBvn/cO9pTuhG95c0w1TKwyB6liOJ8QRAIgcp0XHIPWFUcSHcVsDZeck5Fxf8YUlNzwueYyiwRiJTA=","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":110473,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.4\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJd+B/YCRA9TVsSAnZWagAAL/MQAJYJMMUAPCs35iIsCWGQ\n8148PnbEp4/66KdERf1XIzvDvjz5CmEokX4v/1RkP6f+pRuEdNsQTlHJdi/N\nFrud1zPVEahe/nVcRYEboPldc5S0MCv/XvoVa5nhi9pbEzcirfXpcPQe0C/u\n+SCVGwpl4EP7gOYl6mFctI/cLHrLTATgT+uv3IrBluR+puPPcH5coVrYUqt1\nNH5ByHTaLiUdOEA4NYmgCcatcWdiZqAr81KOYNfRffewqomAUD8r7ZTtgMtu\nlPad1zDZvkYaOMxtCiD+z03MyFqVEDjah9RF7iFR0R+hT81yFSWN5JgESRdr\nGrUreU0UWaDqScRe1Ucyn7lVamqAMlXt7PPXbGoLW6pj79rCRXTkZc8CCkyv\nkdUZQoCU2dvXWh4P55JkCOFwoIFUImhhXVUT0GMGkJYVArDhauADv3oSx6We\nSeGQU2XQ11ffmCaR5q/sa+05LvfMFGM9qvI8CZIyw2a5sIZz5gPrMt7ptQ6w\nQU6ZfDi0EDOfQpc+dZaXSh7N/25OoiPdHPIzqLF74Kou+Njg1As8LQk/M3Hi\nCUfh8TRKIS6jE0ntLjqrrj/qhKoXZ3OrBqOY1oQIq3pE2lP96QBc8kVboTUh\nZK2Q59lVyMCmM/WcotBbKcVLwQaJKsU+oJpvl6Ezrff3ORMriU3uG+hP5iFK\nICJS\r\n=GH05\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/extension","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","engines":{"vscode":"^1.5.0"},"scripts":{"watch":"gulp watch-extension:merge-conflict","compile":"gulp compile-extension:merge-conflict"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","dependencies":{"vscode-nls":"^4.0.0"},"_hasShrinkwrap":false,"readmeFilename":"README.md","devDependencies":{"@types/node":"^12.11.7"},"activationEvents":["*"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.231c6e7762_1576542168155_0.5813801895436144","host":"s3://npm-registry-packages"}},"0.3.0-next.8eb835c463":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.8eb835c463","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.8eb835c463","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"9c996e5cc92853c7a0f8451ff72d68de88978fe8","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.8eb835c463.tgz","fileCount":12,"integrity":"sha512-WBvxyhirXyozdCT65/XPX9E422KovCie7Hrkjus5dl1rUgUgXTmZUxX+IaYzTYLWNni4eCFJF8jDgsEUTMzocw==","signatures":[{"sig":"MEYCIQDu7/paCj9P/7cB9uBPv6bDjif2TrJGCftKrvR+ENCBtAIhAJgJxNmriEJF5ArG7sH2pifVPs9Um0BdnPMMpHQPsHvu","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":110473,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.4\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJd+R6tCRA9TVsSAnZWagAAZZAP/2QKwGiEAC7bsmiJCZgt\n/pQg6bQUvpFNyXEojeUVhLHwWrBpp4MLkBbS+Z60rrOxt5MtGqvTVgnA5Maq\nFgQ7M+NRxGxFpdFiIE3oetNNCoLdekCAcbGyCCU33dlqdsvyHBAK7/01R+LI\nF26e10FXVMy13MOATroHXvhpA+WfFEZlKd8gSgT530a/SBMtxGJ9crmCi4VQ\ncUctKS5OMRKZVQvx7wn9vJl+/ymyeOKecD6me7bZ7areK9W4Zr+NNYJY64vJ\nKCHzeGLzKAzK/dNESEEF0zh5XQGBtwN0dacZtRPldWJc/ttclNQj9w/lPmhh\nAf/abZYqMeRNkUZ3XyeI4ognhXD08BgX5x4QRh2lLr0T7rAX1sRyQbJHRTW6\nnrmGuMhLLcbZMJJIYuka7M/GMF8Z3SO5lpma/qRYW9jw+xEj6+F8EOj5oCD2\n6ZR666dtx0Kiwpkv0OgxoCjcZ3h7H1BpCjGrHoHTMR2a2nNbv1Fj6pfPHgy0\nweSQ8VOkbOPY9ekUQwTfAaY7wIwOzeKUOluiohqR49X/p/Lk2OzgaDoKSRdb\nhVlXTWfdW12RWnpnBSyAbqbPUlMfH322T+mErW4lWdutfvC10m7NbRQoGdDX\nPqAYCjaN9qJGiKqmP5MyaFrTU4z0J3niou3y7YnHW/rMe8KrlETnL/jvfcAp\nlvb0\r\n=eAbD\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/extension","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","engines":{"vscode":"^1.5.0"},"scripts":{"watch":"gulp watch-extension:merge-conflict","compile":"gulp compile-extension:merge-conflict"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","dependencies":{"vscode-nls":"^4.0.0"},"_hasShrinkwrap":false,"readmeFilename":"README.md","devDependencies":{"@types/node":"^12.11.7"},"activationEvents":["*"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.8eb835c463_1576607405403_0.7208132194566657","host":"s3://npm-registry-packages"}},"0.3.0-next.043da28dda":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.043da28dda","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.043da28dda","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"c761656dab8e3546dc2b48b0cb0ea88e0950911a","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.043da28dda.tgz","fileCount":12,"integrity":"sha512-nQQn27k6kCU2Xndi6i//oC6pPi1GdN4PxiVC5GkkyefCgYw3awArtx7FeKudl0regUNwuQzt8veQgCjkRCuKiw==","signatures":[{"sig":"MEQCIEYUOWW35x/4AT8KDSEF6cjYWnZYe34MS5r3OXmXbBUbAiBfCaHGew3JEITOkvVfDCbT4ilTudbdd/jP+ylB3ljPqw==","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":110473,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.4\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJd+TRtCRA9TVsSAnZWagAAVMQP/RH9tAocV3Qh8W1krJ8J\nM4cxzZhoho8b0VbEP3P3vqJRwKQNSt44vj3ri8OELvDTWTNRus6EuguVVOKG\nLNipliledLqroCV2yyiOZxvTtFjPe94zzQpq15i5BozTwzmvzLbkIVEtoDKo\nmi9T2jrt/AoufDlSI3u7RtCQ1WLG4WY53NjQPJAi6AbmgZImxU0QyjXnCA5K\nTDaXSRvg+fEso8r2SSZfEMuJXfH0vW+EHse83f17AXKKn2988amA6wuJwhqV\nx9X6ejle+0q9ufwa6wQXP/t6RF4yrK3Qh9N493YQWO231RivjIVZmtgNPGL0\nbm97FEoHD5RGNV7U0XaOGR2X8XSqjR3Jl7iPDrxgud4a8TqG9CcneNYpSNdO\nApEUpLtymgzc6c0wIihRqxm0MZobVzjuJ4HB5k9qzPM7qxViL4p/d99/lYrK\nWoMwNRllxbpiltOg1PesZZA6AzTyddy12anm2Y8140R9yujWGPefdn9Fme0j\nxwkN9qeKBLaRhY4z7eU7bSxuzFyDlETo7E7rXNO3Uy8A8l+pyv4B+sfeZfYo\n6kCSO1RH5Tu1boMlE40E5DSMKn9FT4qOIp38vSrOaI4FgOMdoOhmYP2XukBt\nuQA5baBumiZCOC3zv4vtEzeQbbBqlozS7PeqdebhIQU4eRetQOJo26iynQ9a\nD557\r\n=btGv\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/extension","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","engines":{"vscode":"^1.5.0"},"scripts":{"watch":"gulp watch-extension:merge-conflict","compile":"gulp compile-extension:merge-conflict"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","dependencies":{"vscode-nls":"^4.0.0"},"_hasShrinkwrap":false,"readmeFilename":"README.md","devDependencies":{"@types/node":"^12.11.7"},"activationEvents":["*"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.043da28dda_1576612973482_0.2185475391589462","host":"s3://npm-registry-packages"}},"0.3.0-next.eb0ca2626b":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.eb0ca2626b","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.eb0ca2626b","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"8df10e113a626f87bc94b2ab57ebd6a47034f161","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.eb0ca2626b.tgz","fileCount":12,"integrity":"sha512-OOTLkNd7e0UrdtxjzP52+Zbk/CQehl4YJ3peRKzFGXNEC68V5Pd+//Uv/GuyfMScy+Ia5HsrSunJ3FqD3XHnRw==","signatures":[{"sig":"MEQCIFAFTGLbMgpTb+/vW2zV094aHavWhqhxzEYebCv31FBTAiAJWutrmSv/7beEsBDre5kuM0qSxt1a+Vyp9C+U5p8z7w==","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":110473,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.4\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJd+XF9CRA9TVsSAnZWagAAc6MQAJyBIkivHbSmV7jWqKxg\naDZT6S+iFtw+wshSqYL52jwK08vmCdAK7vvpbN77ghxW6r9X5FdpEpwhHYu6\nrmYb/mJQqc4hrgp8xRX2VQzI4PJiVkUR22iDdzWcSy/xTsFFMXcO17u7cvSF\ntORGwBxVhqsx+8PK9z8iGRIHucvTo+szfjPEoUgEvq2zX/0n82Zm/GflWig0\n5f3aVZzF2Lyaejdu1sXkDQFFr2EVckgUb1PnhIIBiq4CMsJ9RDArFw4Qj+Bj\nZXSLLhHiJ7tFyhfXtEr3Yr1JWUmhU5lZXAxiGdP1+ptrJWjOETJegUZBXGEe\nE956Ntrcrxy6Z5oFaQOYem4K2nRQLxw4nBhzCPZrcpMGUJO4hCOG0wbsYebd\nHHIJ0gM5gJSrHbjbS7luiU9I0glSu9tcJJmS9xTt/B5HVNtmmEJakjm4USRl\n+fVkvZjr3yxzkmlg04ObgK2u4dmoJoLcHpvn2CD5RcB8J4ZrI0J0gMJevirn\nUo5cd0nMpQIhmuMbYdRR9iVlTNaZSUgfLr3TIuHP7vKXmuEcmsqos0jqpMX7\n1Qiq6hsItd4qkQR9SysokDTcAj3qMLpwD4Xm5C4U0qZx/5zyt2BQEL3uimAR\nYIDmyM2WbPKNY1OWMumGRoH+RDiphjnTZJIW5isI6B3gVpAQeVLRJSuFOGxA\neueU\r\n=Joij\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/extension","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","engines":{"vscode":"^1.5.0"},"scripts":{"watch":"gulp watch-extension:merge-conflict","compile":"gulp compile-extension:merge-conflict"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","dependencies":{"vscode-nls":"^4.0.0"},"_hasShrinkwrap":false,"readmeFilename":"README.md","devDependencies":{"@types/node":"^12.11.7"},"activationEvents":["*"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.eb0ca2626b_1576628604994_0.1638683862247814","host":"s3://npm-registry-packages"}},"0.3.0-next.893369ff8f":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.893369ff8f","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.893369ff8f","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"e0a49dc5a9f076215c85148efd7ab920685916a4","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.893369ff8f.tgz","fileCount":12,"integrity":"sha512-PzKDTGz4wiu8UAlQefOs0jDsmKqtLvD1QgDoMPkIzeXZvHatsGt7FQhs3wLuJOVfFwuw9UxkExI3rUAkmD95SQ==","signatures":[{"sig":"MEQCIGwKsdbam1UZCHzGiaCq5FUabhGIC9sJdz2CuojVRe8wAiAsBCbSef3/D6KxWldKelyTp3u56EwEcsjBvVmoherm6Q==","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":110473,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.4\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJd+sNJCRA9TVsSAnZWagAAxW4P/1P4R3Gc5EdQF6ZgibZO\nH2912e7WlMuhxEuOllBmalCEaYbxzODgu8whHIsxD8iRWb5XBhx08MldhgSp\nwcSTHtzfwDOch29WfrbEJLk+9aD6r83B0GJLaRU4YPyJssVZfrtIEfo3qQvd\n46CM0tRVsUmWO4WkMdvLqlbEkxg9QQY0JgP5ywsmNK2EoWSQCG+IEMJdOVeP\n0oNLjd2Z/YjC+D0j78fdPUR/j6XbwdWp0lPBXOLKnJQKpbl6d0pWIEzD4aIJ\ni+wtmpUIiU91wBYfppXd/QTMcX8JpvLeWxAZvNTtyEhxwrBnLPHMibmDFF3z\nfHOzB5mv0G+UmYb7FFQmvuwgnMs1P+VhSVZJUyD6JLUUAn6JQtbwPT6pd98z\nrvY80SQISIZ48a6Zm2VAZWv5WcR2oYepsUwCxvxAmGQE6gsv6b+FFaO3BOcj\nEoU3TxlQaPzLH05LRBdsx4Sw6jqwJLHJbhoNfcQEwpHgwpJNA/zrf7ySD9dq\nB1Nc/5ksDjUAINjvC+O+UET63zSZMXP1/8VliOn5iokXvwGV9ClHBn44Slr7\nQ37WuPyeTwbvEry9hCHfO5CbfvTw5Q108HEU1S350g5LEC0D4gMANvPucFnb\nqT7TuBqAZVG21V+U45oSnOJjyCW0kWCyNDPMUFPjDde8yVxMOuti5Q/NwLm9\nnA0z\r\n=EegK\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/extension","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","engines":{"vscode":"^1.5.0"},"scripts":{"watch":"gulp watch-extension:merge-conflict","compile":"gulp compile-extension:merge-conflict"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","dependencies":{"vscode-nls":"^4.0.0"},"_hasShrinkwrap":false,"readmeFilename":"README.md","devDependencies":{"@types/node":"^12.11.7"},"activationEvents":["*"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.893369ff8f_1576715081192_0.5602234773861499","host":"s3://npm-registry-packages"}},"0.3.0-next.1fc02159b7":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.1fc02159b7","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.1fc02159b7","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"e4ba5e0708d2e226c8a24e98afee6ee314bdb3d6","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.1fc02159b7.tgz","fileCount":12,"integrity":"sha512-LbAx+FSEHdwDDtGdffMWURdvNmjaw52wcXDY91TuRuzynGxJJkiMlsdXTENsXjdDloopw3SNrOQ88lgiyrPdVg==","signatures":[{"sig":"MEQCIAqls6InEEvXu8ZpDirHfx119TcCjOLyQQ6/klMAFs+OAiAy6xSz2e+rQv9X2lMIJmFU3G/MusV3A4XS1fhOSVnTow==","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":110473,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.4\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJd/BSQCRA9TVsSAnZWagAAX+cP/ArEeXYDaXOBMO/xt/Dd\n1HRymUYhxkGp76FowFAhWSFH5c3SeO+bjmhX1JkTgrfzLQZebELLE3BRiavE\n0iNK+mNozLI4Tt3cAxVtORECw/e71s7wGdK3v6GuKVCJ15Q8TTwc8itTHbeT\n0/Eh2iG02ctYe0x0rqqFHSHA1F1UaJ2AOmvai5Oo3H3TPvXx89ESZpHUZg0o\n0MRSiRCyTRtX/++rK/DlvnmVcuO3YCJ8k4MBN+wdvwbxB9JW7YEZU3gEQ1I+\nwM+YR07VB34bLviFAumkX5k1tLb8InGVxtH/vvy7CKAZ3Oa3Enlfs1ALZvih\nJ2s2MAdtlrk0jMcg1MMNnuG8qbnXxYItrl3fF4uht3zIbwVyTP1wmDWusinr\nhkvDhY69qRERZfFTekA/870OXR1DhKOHL47wihDs0EG4cwfl/idKHohEcqX3\nHwvo0PMHqvPycWhf8xedVSk0b+Dg91P6d5ut2SBASAqfpgK+xiJxgYqfnL5N\neb13yp3y4xsecfG+CAtnRs5jM2GHb82esblYgD2uOZKD0VK1G8q/zV+eJbG9\nlXJMATYwTvAPiadCotwGmEQn1S11AUP4Jb3Ek2f0/N28T/0Ba73n73zEpbYH\n6rkSjagx1nTGDfh1jBvTcDtpt22YJ5w6LONd1UNTzEQrxawkLNDKhbSXBEEz\nnzeq\r\n=9TWn\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/extension","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","engines":{"vscode":"^1.5.0"},"scripts":{"watch":"gulp watch-extension:merge-conflict","compile":"gulp compile-extension:merge-conflict"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","dependencies":{"vscode-nls":"^4.0.0"},"_hasShrinkwrap":false,"readmeFilename":"README.md","devDependencies":{"@types/node":"^12.11.7"},"activationEvents":["*"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.1fc02159b7_1576801424225_0.4324311907902523","host":"s3://npm-registry-packages"}},"0.3.0-next.c0c4eb6a51":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.c0c4eb6a51","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.c0c4eb6a51","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"b4afc56de574379e3445187820e3ef5f778e4c28","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.c0c4eb6a51.tgz","fileCount":12,"integrity":"sha512-OYgUCWKWWsinM0kw86qrbKVyvrAjmaNm1obVBXFTrAy6HMfaiV9EdyT6KFZNYFgUy7Db3A1qVBkL3N6MhVf65w==","signatures":[{"sig":"MEQCIENWni31Ve/SRhIzOEpeIrAJEFr6gtp0BPUoehd2t6v+AiBm2PbE2VV8qr+RbmgCxOXyVsno4Pyy8ZbvbybOyI2eng==","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":110473,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.4\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJd/WXOCRA9TVsSAnZWagAAR+EP/iS9k8ahr4JDltERSj6n\nMQpukaZvDtpfLaORGrA0fudbTus6coOldTN0wPuQaCrS9RUEzD3qzekLNnf8\nRCWp542TefGOj61XoB4ErAqY76VRDdvSsgGO2KTJF8e0wtbgASDXU5vIa1nO\ntwwHd36DAcQ1ujdP/stvTnWuGSyGFlMJw+ms0GtMRjQfyJpPyAuUnm5KGR4G\nbBObE60IqNWoSO2eE1yMkxwkhq6lggOa031mHcKyQYgGINuOjaHP6zkdASr8\n0mEx2yYeB3ZSYlcIijyX3uVDEelMwmn6KJRi0XDZv5+a4MhG0KUmbW1reI8D\nOVrxXq4Fr8kXFqKTG0VmJgGRbShUSqrVBEZ9yoMWaaxs5J23ETOri9jQDs+2\nqyFbjXj64jTB2CCR2oS/UF5m5aESRxjeXtu+DEIHTWpOXic3qXGYtnpAuEDs\na82Itbg+dARuZ6kSLkv6bGoAWOtTsa7RASZDNCrFY0VCkR0U9LJQNz6VFmui\nUv6lIlQhR05V2gp5upi+7txESQeNXRM1cTNoFRSmI3xW9M0AgCUKuO5e2KqX\nbUfE/y1D5I2zhL7TDzL3pm1taREbp/ya5rnAiX7sjrx7TuKOOUa/H77j11ki\nQIhL307cKbGzxr+m34TBr0CCkg6yhT/fmB3T51Zro48zk0V8VzKz5DI8ay7+\nsvQz\r\n=4rVP\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/extension","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","engines":{"vscode":"^1.5.0"},"scripts":{"watch":"gulp watch-extension:merge-conflict","compile":"gulp compile-extension:merge-conflict"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","dependencies":{"vscode-nls":"^4.0.0"},"_hasShrinkwrap":false,"readmeFilename":"README.md","devDependencies":{"@types/node":"^12.11.7"},"activationEvents":["*"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.c0c4eb6a51_1576887758096_0.9315957706756315","host":"s3://npm-registry-packages"}},"0.3.0-next.d06f0e877c":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.d06f0e877c","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.d06f0e877c","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"036e4307b40ce2d2d42e23602d46eff35836a0bd","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.d06f0e877c.tgz","fileCount":12,"integrity":"sha512-NKzS1rx4wKoeETKbRvySOSsrTLrTER2uVXBw908yeg9aFrik9cTVWXEMICuwlPC6PDO3Ga+Ui2LBlLkMYfk4Qw==","signatures":[{"sig":"MEYCIQCOTCZZDrcAd82kaRGfGVI+yu8cY27mnnfstmOuR6ETtQIhAMOftTi9hd4Dp5JuETtZtzX8aOoIfTZfWyqSmNz5OhoE","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":110473,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.4\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJd/rdTCRA9TVsSAnZWagAA98MQAKAfPw9pXbvX1S6uf8HE\nN9cRh6PloF0bMtd2hdUk6LtnGoouQiZX5H3lXKwjVSBd0/DNDkexAIeffDlv\nvseR14qlg6CymQRYjMQY4RIRS4/eOUIT+t5uDzNXAnvlSKPOJmQSsvCBTc+t\nB+owJ8SUs7FZuGj+v4+202+Vb1BvbQ8j8XFLsJcN3xt7KiGxGRb4aRvUnh6a\nvy8DZW3xB8Sfusf99OC7qF4HB8KWLsj7c1LigfyyKFWWVTEoqCMu6EOaXn6L\nwyZqqvQnOVUQNrdru8420OtIZU+JuIJg5gBSPN3Qu7YQrXS1FVm7bfXUzcg/\nTVmwRmesxEH5tWRxEy0zefp7JOMslqqCwXU3VTIbqis34CIvLwHgr67an83e\nDN3bxb5oGBFX6EshX4dveMwwRtUWL7YR+qUdnOZgWHG7nXYIjzLvkWC/DTlO\n+qax07boG4y/Sc/C9KXxgJR2zd0/Ek3/iWzls+Z8ZbiaO17D+pB2HOqsI0Km\n6ojocywIq5prLbbDJjqEPFjfWmJ9qfGUqadCgt9aJ4UwepfW+Vt3iancMSNd\nc5l8uFKufLNc1FjETRjWfsBsxL2b9MnP6CH15VJElsOBqBCKnrN/urFi6A7e\nk3L6rbigRFQ1bmzf9dg7dejjAgb6ws4HUQkR/LUkl6wSi7WGVWFdQoH5JmWk\nqrld\r\n=Zg/E\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/extension","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","engines":{"vscode":"^1.5.0"},"scripts":{"watch":"gulp watch-extension:merge-conflict","compile":"gulp compile-extension:merge-conflict"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","dependencies":{"vscode-nls":"^4.0.0"},"_hasShrinkwrap":false,"readmeFilename":"README.md","devDependencies":{"@types/node":"^12.11.7"},"activationEvents":["*"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.d06f0e877c_1576974163237_0.9529646213676819","host":"s3://npm-registry-packages"}},"0.3.0-next.8cddb0bbde":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.8cddb0bbde","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.8cddb0bbde","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"a899bb1d2f41983315737f04a36a56ee19908298","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.8cddb0bbde.tgz","fileCount":12,"integrity":"sha512-u8Oo5uFFUAGCMwP75cmxFKrEoKzusTe4ojrXhpEYiuVUZ94pdXRbt/5uCat1GaqYPwbGsNGTPC8RKFkD5FF2qw==","signatures":[{"sig":"MEQCIH0lD84BSECs6awaWYrvCyvHeTBjEjHvY7lQnJgWzCUrAiAD4RfqP4Ff1fcAYSx6eEKjDG9vD705HO5G4gczrSJv6Q==","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":110473,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.4\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJeAAi/CRA9TVsSAnZWagAA0DEP/R2Gc/H44DNCDDvI2dvI\naR50ny5JD9d+LZRCzIhyKMe1JR1USfq1Xf/jxueT9OqeXYmJUr0Xhb76NSFX\nDEsLBSJLRlv0aUWCuwdtrqMZ64tVXUzsd7LnIMvgNpvq8Nd+1n/Kk+04W77h\nJfV4soARRwSUKmfvukAFBWBAQjZXEFqWE/F0SLB5a42Sf6NDFHbqPl8du5Ax\nJvRvxG66k/VvYkx249fUPs9PPuPk5Q8LgChuJ1pewV+bV/rix5/c3ZNOLw9e\noA+68nZAKNgQS3U+tCqU4ZIWVG3EZnfYFPJGVZjsnDFMNBpsqnyHSF1h5ofj\n6rL4waiht1Yh3M11j3AdKj90u9fejk3ySsfbF1GeU3lvtsybyhF0Mo6Pt1vj\nKOh/3xlZ+o1F8PhlbP0lN5/wqDF5PA/fQEAFUHNOhXfAa7xPm94+UFQesp+J\noYGl69cZc5v4ll7Ta1LBQADrSYEZ5cYv6KWFjs2bDTaGJ4sKAM5IlyMRCrqe\nsAeM2dWnGBDOYb4TOcty0l/up+I8DYfddSRqhV7aetkBCLzIT8oSdvd6AeQ5\nIPYaH4aPtEd/QeFu8WRz8jaNqbeYOelF7aJv35IqYoZTm1R+rPpbYew3ZNj2\nI97NwntJ9pXJ335chKaM77xmvG6EHyfjJNxvcrdfJR/QpuVDJeuDIDvgyb3p\nBOQ/\r\n=yFRD\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/extension","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","engines":{"vscode":"^1.5.0"},"scripts":{"watch":"gulp watch-extension:merge-conflict","compile":"gulp compile-extension:merge-conflict"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","dependencies":{"vscode-nls":"^4.0.0"},"_hasShrinkwrap":false,"readmeFilename":"README.md","devDependencies":{"@types/node":"^12.11.7"},"activationEvents":["*"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.8cddb0bbde_1577060543327_0.3235317500251922","host":"s3://npm-registry-packages"}},"0.3.0-next.656fff3b1e":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.656fff3b1e","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.656fff3b1e","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"02899af7b7cea2b55216584fa12f207775ed7431","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.656fff3b1e.tgz","fileCount":12,"integrity":"sha512-EAJ+yKAvYkiDkAU5c3MzPznVthGYGaXWu/ERFw2FWO45dq5mbyPsNzLuvkghrxMwNSaBl4JX6bWYO4lFYuJrxA==","signatures":[{"sig":"MEUCIQDTySPjUVXL2KX/54yPBh6y9gUEyn284oyci1GH1WLHUQIgZC28zHCWdWQwFWgmZjAwilD70gOtuWlCiUbLWqMijH0=","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":110473,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.4\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJeAVqMCRA9TVsSAnZWagAAqaYP/AifMLl4Xs8/G53QOEvS\nOoOMMHiEdJzAYJLwqcLn+VNgjtkb41hAB6OH+RyKO0kVJoV/WFCOVjo4UOOC\nhXGH2i2XfCUL4gY1s6nL2p5cmNrJ/2OgGJHYYJ5PYgVMFtIsPIgEkMUHidpj\navGCGE0QsSr+tGkRFMXVP38wREBY6rK8ejHRW9YrQSK+jfVmlWPArhMVG8iN\nwRewqho5cc5L3TBQbldrbu7/rxwXt5bhWXcE0I09njgxme40VgDP7Lm2ZpKY\n9lmuCZJO/o2s6ZYLyLOOxBRgvuhbgCxJFYpS/ZlzUUc8tiCPPzHIzsBSUh5N\nSOLKot2+yUQmoHvXIfvtdJl8hnp/N4/E96O045t+xn+vlSzIeOBHPAC2hG9W\nUuF2kg9m1sBeYz8DATU2pxPclUkdpA5y3GkZMgiQ3tAsEIph2XUUe/0nf8qh\nFlSyzspv++EMBFn8OKnOffCjBc6n8Efrbr6gMw9MI84vxX1NsOSs99Re2s1Z\nkvMuYXHb/xZWqoPncmEaYaDSkzvi2JKHydZU/7S7UlC5rO/PxTno9qfD7UHW\nR4Ig6bIJU3Ds3NBUF3Q3Vto1U82qKe1gvZmo2aSPZ4uTsOQaJalqXq9HFqV6\nqVuH/lb2DYkCS8Rbr97VBqeCbL6c5zY6DySJbmnsmTu+PCPZiyCKoBVZLa76\nhQNJ\r\n=HmaH\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/extension","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","engines":{"vscode":"^1.5.0"},"scripts":{"watch":"gulp watch-extension:merge-conflict","compile":"gulp compile-extension:merge-conflict"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","dependencies":{"vscode-nls":"^4.0.0"},"_hasShrinkwrap":false,"readmeFilename":"README.md","devDependencies":{"@types/node":"^12.11.7"},"activationEvents":["*"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.656fff3b1e_1577147020096_0.5407008800350472","host":"s3://npm-registry-packages"}},"0.3.0-next.ff5f581425":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.ff5f581425","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.ff5f581425","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"c437a13d310e96e5189efa9ec93842bcecd984c5","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.ff5f581425.tgz","fileCount":12,"integrity":"sha512-H1KvJ3DzGg4uGWKUop0rPCKqF0luOK7CNRjK7UezVy8la6dD3sVHQQ0jroXrOeWqUinQv9WN/GAh1FIIUkqL7Q==","signatures":[{"sig":"MEUCIG9xpdZRu6Z3GQTeo6oKffKOqByBTM0xcX3Amb38MVLoAiEAoFwid3eM/nUrCfCIkV92k7ASEk4QVgMaCD6eeBBwKaY=","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":110473,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.4\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJeAqwGCRA9TVsSAnZWagAA9coP/RGGJb4biQdeRNDy/SrK\nA0jby8bR4a6z5PzISBQLA1vOXxp9D9uWi9RG3mrWYLcQ0yoZ3CUV4SwWHDtR\ngqhZidHs8Uvrd3hzStYBwOO0pnLgaxH2Wtz806DqFJLYIS+hPDfGYCu9BAH0\nbRnrRnLI0COfJuK7GGzPKNjMPyNWKUGjoLt6hqEqg74KtacKMHZCGUTmiHQu\n3mJgHOU+ljlW5/UZFp5wZsYANTes5lf24l3dPFN7o/6CBSbZs7mOt307kPgY\nHYdxvtOwuofgSYbhfsg4Y/+yrcW3q8hQXU+qddLBeTuXYBkY/G0XIYbd0+f9\nQgao0aAshkgtacQJ7l6VIZArA9TUeK9hGO/weXayRmc9UsTEFpV13S3eL2zD\nqA0q6b7xbChjdLAn8dubsKvFttRw/vaiV3PgtMDkWUG3AxmBLHpmUTF651Gw\nKIwEEF/4BvlPliV4KiLo35JWXswzy0o6k4UiFAP+tCH/9hk8KCYXfFqjYCY3\n0G4WqxrYMxGHDx51of0L4SIEelb493ZILbmL78ZiSn7zvl2ogJhH4KfUCcFd\n+kz+SEz8bg9h1cpu306HNaifnWm3rLjlnGQxhMquiyjR4S8xJ6Ech2CH1jOP\n5bKkWSEjOVX0IEhKdCBLIsuYFy2mt8pCxVwwl2smjI7gkgip06pg0cxPHsii\nxeYM\r\n=sDMx\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/extension","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","engines":{"vscode":"^1.5.0"},"scripts":{"watch":"gulp watch-extension:merge-conflict","compile":"gulp compile-extension:merge-conflict"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","dependencies":{"vscode-nls":"^4.0.0"},"_hasShrinkwrap":false,"readmeFilename":"README.md","devDependencies":{"@types/node":"^12.11.7"},"activationEvents":["*"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.ff5f581425_1577233414232_0.805466238567023","host":"s3://npm-registry-packages"}},"0.3.0-next.8aa2191271":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.8aa2191271","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.8aa2191271","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"6134ec26573112d8d7ab27a61173551bd8dd5f74","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.8aa2191271.tgz","fileCount":12,"integrity":"sha512-rm39ktl5mOORq1/htQLwZw7kmxYLwFPSlXbss5wscUVZT+wmEwQCqpw46rag94GIvDtjlvKiZOrOGZLbIjxSSw==","signatures":[{"sig":"MEYCIQDXvVSsi+SCJgpFGAm1jnMjd5q7oKKQFoQ8nhFHNqu2aQIhAPYLhxZfAiJpoutyHTlldNu0CWhuhuA4ZBhL+HeLgBUH","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":110473,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.4\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJeBU5ACRA9TVsSAnZWagAA2ssQAKSs+gdCKfDXyliEDgLj\n3AIPF+BBj5UIjGbpvooIp6RDAAkl5uGQeVLf302gnXitHOi81Jt+/dCLMU8Y\n5KA7USmAKug/5BRQXng96BZv/HaoM7tMKfCAUQZOGSZPwCLvJc1KE2su3ht5\niZMqKP7FBFISV4U7rSsUPTXQ+PR8nQSYfIMUdLcw1AJsjZ/niSAOb1aUeSU3\n9s2RaMlSfM146a777S5azEIYXIOqs+dBilvErEbNkSChWpOpjBic4rqcP8/f\nOZvYKx6kNYMn+8+yXerGncGtW+Rm0/w2WIaKz5d6rNSDO3IjCrKPtHTBhTx2\nAooOpwpCCEGcfVeZqUoHQpfD+P0p1xi5u8v6nG13t+DPtwXQcy72OogqQ1MA\nR+KwmkYp4kMaWDjjm/Iik7b6RYaBYKzKL3crXN5hzVFtlEzhVF6UhlrWwQv8\nU5aDFbQlcG1xhLneMOnVKPTqHYfejEsJnj7+aqNVM3jo4lrS3yH5al8P5INY\nHbj87C27V3OlFaMlnLw6f/kZ8zrqPDjkTYUErPsfOHyMvOehAmYEza6bby95\nQs5mamQ7S5RdkVs9em0XkW4xJRDRpXtKcmYPugN2+KYNoRUXLgX3pkv9JBq+\nBjahcPDgj//ZVbhmFRQsMkV8ItVpWUOgpJeLz86z5VhXt9+JrRI/PddDzGFQ\nPL1b\r\n=Qm35\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/extension","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","engines":{"vscode":"^1.5.0"},"scripts":{"watch":"gulp watch-extension:merge-conflict","compile":"gulp compile-extension:merge-conflict"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","dependencies":{"vscode-nls":"^4.0.0"},"_hasShrinkwrap":false,"readmeFilename":"README.md","devDependencies":{"@types/node":"^12.11.7"},"activationEvents":["*"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.8aa2191271_1577406016310_0.7286638294513608","host":"s3://npm-registry-packages"}},"0.3.0-next.502fe13712":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.502fe13712","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.502fe13712","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"244325892cee1d6ba93864dbaf6ee37b64c4fd6f","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.502fe13712.tgz","fileCount":12,"integrity":"sha512-aqoeErsroN86efnHBiQEVnAiAoudoQGNSO4L2HJITSyRwRBC3oWcdgBzQrfzcEZNgZBEg4erBF8MLg0DIWdfQA==","signatures":[{"sig":"MEQCIC/QemzGz0ZAvtlboZ4csC6iK5hFRVIoxq/YeFdEbWBgAiBCHZuZ5561gUa9Fn1c0NNNY8AbROcAKSnPXGH3WQpmmA==","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":110473,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.4\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJeBqBrCRA9TVsSAnZWagAAYF4P/iqS2SM8IrKFy5HyDKiT\npTdqRR0q+n3ToWKsmq+H9KAYf8DreT2j4OYYtPGMOM3ZsDq8zXLNVB3QfqcO\nff5g/Ecis+ELCeYZRufujc+z+MrbwO8EeMQV752zX0f2+usekdTxgjPYUZJ0\nvwm6kNTqMSje2GzPqRMPJj/oZd/J/CCydv35t30ZZ6c+69BEnGC8L1dsAl7x\nkUWsvMOVpn7aFSGbwz7jE2qJssXjrav3Lq9OBhyquCXmoaT6biLJ89pmxDsJ\n7Zh7bSx/yTA+EUHkjEx7mX+UaczzNrOocfLzJAI1ihKTxCKL8/F3+j4/362r\ngOrA5X+v5KRUpcvJc9EIFj7P1B2LcJ1azz1mBph7loznqNpBD1fPPoOYr+tg\nXcuOk7h+b4+7Ltixvm+zaB0N+pE6vw/HAEuiOzP7pRnDGJi7xWt7ynqTYqbX\ntb5tSCqa/iqWNKfbV7YzneSkwY8rZLjPVqYgcw3eBmFgq1hwBR3jbnvdsyrt\nMWGHYK6enHMMV45Rexb9g6nzV0f1duVZblF52OybsrjliXmQCEJ63BMnCgSZ\naasQNWOyXdn0N7+MrvP4VRLKHGfk1ygwvk/XXe/Al0qZSXxUm4RQs8yu8f7E\n8UeTGciIkBXzdhT5RLTkVRPQl3l5WjPrCi4H2jaiF9ZH0PCMGMwAT7UzYA61\nN/r6\r\n=IbMY\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/extension","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","engines":{"vscode":"^1.5.0"},"scripts":{"watch":"gulp watch-extension:merge-conflict","compile":"gulp compile-extension:merge-conflict"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","dependencies":{"vscode-nls":"^4.0.0"},"_hasShrinkwrap":false,"readmeFilename":"README.md","devDependencies":{"@types/node":"^12.11.7"},"activationEvents":["*"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.502fe13712_1577492587062_0.6081090191666361","host":"s3://npm-registry-packages"}},"0.3.0-next.d6245d285e":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.d6245d285e","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.d6245d285e","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"83fdd4acff03400087f5d5333ea230bbcc61b1f5","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.d6245d285e.tgz","fileCount":12,"integrity":"sha512-RvyjtcoH/XvjJO0HHx/G0c6GiAdAeRkRU06inL84v/6knOa5qgiKbUAZy1LO1XYjHT/bomUsd/vBVCNY/Bl5Mw==","signatures":[{"sig":"MEQCIGo5GiKlx/YwPOQks+9d4TXiUuc6VaPgXmmH1ODuN0N1AiAShsZTi09amekzEdbpDA3UecrzsG4ITvnJ+HTM7duibw==","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":110473,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.4\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJeCULRCRA9TVsSAnZWagAAOyEP/iIOJrfXYDnlvO3tx+Af\nj4h3qHleELOmTzo3Nqil5zbuly3dhr6J4iEcqA2wK9evZITE4oGmKCf+fQX2\nOqxgo7cQvqY6PJT+XdjS/9TpXHp660+wWVpy37//K3GSBJHf8l054/wy4w/r\nJ3N7/ehPNWvZAdbSW0HkTpYyI2X16vAfI2nrS2WgTziQ72MnWQ6jMEbMAhQJ\nyeEsVG/vPkjnzSNJsCYZcXRiTtoQ3NjF0Y4PYPuI7gm9Vn6FgffoA8Zoze0g\nEwKIHquOTyqhzznIcUUPPm/YVifs/E+S1YJNxMWy2pNn1Qox7UkNkrbGuTik\nkNaX7vwTt75TGrR+XWXRDhImyIWX/5wRG/88xWB0gPxEZoJqRLYNCTcnCm/5\n8IYn/wOt/6bNFp5z1DNfeC+i9BlWwK1eHxGg5YYTVkL2IM3GYARZbIqbvwPh\niH5pIDL+IEov+sDjixtrrx2E5QVFXnvp6+K8ZAHohWwhmukzO2og3dOTPfnv\n0b2gDNcftVxCZQdNua1J8wOTY6Lmp5D7djLA9O6hBU/KVeEMA5vpp0cefyBZ\nm3B29gO4QuHVM0qth6Hj8Qz7l/TRCFp9IBhvUD13bomM4CfrGhGgXJvtp/6i\nyZwj4XHBrxkFGIYoFeLfkgJiSeixp7pYcIoYzAbfe/4SeCoj78wcPHD7DYpx\nvJv4\r\n=yJi9\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/extension","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","engines":{"vscode":"^1.5.0"},"scripts":{"watch":"gulp watch-extension:merge-conflict","compile":"gulp compile-extension:merge-conflict"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","dependencies":{"vscode-nls":"^4.0.0"},"_hasShrinkwrap":false,"readmeFilename":"README.md","devDependencies":{"@types/node":"^12.11.7"},"activationEvents":["*"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.d6245d285e_1577665232876_0.49946432901817994","host":"s3://npm-registry-packages"}},"0.3.0-next.79052bb8eb":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.79052bb8eb","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.79052bb8eb","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"2229c933c6f9ca21d87d3b11e717b1ef66d9afa1","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.79052bb8eb.tgz","fileCount":12,"integrity":"sha512-JdalL5f9a+jBP5w14Gtpf9ZnLv+ayVvy2ZreEiVpwsBfuaYwRQezFN7/LKTGLnRtYYudQDZcGJb0VPzk46uejA==","signatures":[{"sig":"MEUCIQDxrd2V1/MnmeYyBZWHJMoHV52eZC9qRVjeyVg6dJh0agIgJhNuCIYVqYIjQqoPK2F2Z50dmdltQRfxoxrZzw1U8Ek=","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":110473,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.4\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJeCpVBCRA9TVsSAnZWagAAckEP/1LH8vn5qXcKNDC806ZQ\nqqbfVd7fzDzdglOK/1ba8EhTMiO38d5wm1AgYSQlxX24fq3WTI8wYNAKdn9I\n+5LWf7DfImO7Ol1WHf5dU2c0Luab5v4hNMgXSBeb1ZwhXewYsVvWJj0sdqRZ\nTRE9yMBfzUS9kZLVS/HMtqn/65OPgCoscIKbPQ/yM0jXgidVvjlzSPhiWBeB\nBwQlJ3ZU+J4zvb9GG14NNSNSsGmXQYyPEKUwjwFc01X6jEwvrE/R3h9ieapK\n9fDGA7tsFzNFiuxYXnQe2NIU3kj7ZPMjQyvwHIzqpLGIN/yVTpd9HNsKLBdK\njD0UC6Df7lfMevD7t2KaTnzqQZjLoOm7Tdbeh2ovcG3MsYKiZNpfYDVsnv9g\niWDVDevFzn1m3YxEtFuLFWxt0uFTlUBCM1X7m6d29tyiSyZu6x9XmmD+c5Xb\nnuy7WdDIaRkIHXzYnV0QlFlvNfCZHBkfo+bbJX2QiAVCubQAq5lAKpTO26+Y\nL+UDU6tc1stqVBKmfqEJ2GyP+U8/H8HZuy8+PVRHaeIfrQT/v2FQaZd8+6bg\nb9MTpCN725Pn4WBFKjraLOOGTAn1s8jaEOGIsQfATV/uxGQ3z717qB3qO+W2\n2ywrG3LJVMbqj/gxZaLye9Ltc6S+hQnH4ZrSv3Rp7PdPmOBaK/k1jVa0BEEu\n45x/\r\n=cVAN\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/extension","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","engines":{"vscode":"^1.5.0"},"scripts":{"watch":"gulp watch-extension:merge-conflict","compile":"gulp compile-extension:merge-conflict"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","dependencies":{"vscode-nls":"^4.0.0"},"_hasShrinkwrap":false,"readmeFilename":"README.md","devDependencies":{"@types/node":"^12.11.7"},"activationEvents":["*"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.79052bb8eb_1577751873051_0.3025877522374443","host":"s3://npm-registry-packages"}},"0.3.0-next.7493a60464":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.7493a60464","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.7493a60464","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"c80eccd683730dadafeb6af2a5f2ce8670c4f101","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.7493a60464.tgz","fileCount":12,"integrity":"sha512-bfnkRZGY/YbsuI3+9owXvEvLYPMoIyVpOnFVhqNeN55b/Oz22fVlknDoa4zaRxLAyq1eCbGqSjaNXpsL3eRWMA==","signatures":[{"sig":"MEUCIDN65g0ygygFbTQZ1czIdF5V9w/UzLX4onCJAVyIejl9AiEA1riaHdcP6yMEll2ndGfryz09I8Ls8HOWBP+DQC9Tl18=","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":110473,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.4\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJeC+a/CRA9TVsSAnZWagAAwLsP/07XNvdUKX27dvD3g9sX\nJ7bxNVnlF3udceFQyy6SKLMf2coy2dZ6e1fzLAqlekiNiehDosNjF9+u+6jX\ncZ+719W84050bM32cBPnfFj6adJ4ACnKYT+PXxoAMtqe3nlZ8RRoGi5On1g6\nhkgUpQ/2cJl7QjtFkvLNkqFdtRcrlj4Mucwh8OEYaHJjX/eno+uHeZ1k+ltX\nCAz5dcl+q7T3lMf9ril/CZSTIHQ5Eavhbp2hz5Y98W/gf9apwm64nRHH0Tk4\n4wgt8I3MA51y8G6cTa5Ls/L9RzX9Q6InGSAccU34MIrCo0afhhY9w7jmhJ2O\nrpNFQYVcWNrj8hxOzDtCAZffm8gjyjCrgn30jUHEEwjIa3q620Fw2zyNhUSe\nBw2NHxA2CcjT2ARt9KgdbAUkU6l5SZEhVtfLkTclYv7AwvVsnuQEt/+oIkNs\nE2gf68RQLL0JiTxlWjHCQS7AsUStsLNr0fcssP1mW35gjJecpte4KCzviXu3\nsTu3ZQ/kd6fS71fry+RWHq/WTusKlYf17b5TEDzonyFbPlQoIkkhtKpt81DY\nYnZZUxHvhqbKsFVZNsbzywA3GHWHUyojmIhERqC7+WSSiQDn0xc2IHy+45Ja\nk5jZ0Q0ZvzWOxPSSgO0JX1Chk2YKf7F12tUkCMphwY01LQi13tOKVb+046aB\nk3jE\r\n=9YTT\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/extension","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","engines":{"vscode":"^1.5.0"},"scripts":{"watch":"gulp watch-extension:merge-conflict","compile":"gulp compile-extension:merge-conflict"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","dependencies":{"vscode-nls":"^4.0.0"},"_hasShrinkwrap":false,"readmeFilename":"README.md","devDependencies":{"@types/node":"^12.11.7"},"activationEvents":["*"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.7493a60464_1577838271507_0.345956393546879","host":"s3://npm-registry-packages"}},"0.3.0-next.672ed38dc8":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.672ed38dc8","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.672ed38dc8","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"1b5b082abb816fbff03dd89a35e89a3b1ea24d07","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.672ed38dc8.tgz","fileCount":12,"integrity":"sha512-cMcel5n76argGU20t7/ONXOs5qetrLytQ7YHxla5+INFSVInTYBJTwH0atpjFVe64eTUueRpwu0si7wHnCy74g==","signatures":[{"sig":"MEQCIAE8ym0GUMJ6r0fzL6XBYdnoqo3f8MFpkHz/MlzMNkcYAiByvPWArY7QX8Fjqly5UXt5eWzWFd3lB2ohsAF1BBlC+g==","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":110473,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.4\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJeDonRCRA9TVsSAnZWagAAnPcQAJROcL+Ro0Yj5u2napVv\n0Ue0AFEV6e+gy7M0BHfX7argmFtWrMIQ54xx/NhJDQbQEvnDFSwai3ZavsRD\nQX5IF6AmOEAmTdrqSdThjqSo/A50LyX68SJwoaLdHaYJwDNtaE96+hAleLO0\n7az2yFlGflJxEqfGRtpO64mA1vB6NahkB0C8MKfMH7qVzhDXLicyJyMzx9rf\n+XklzxSV2eCxBLkg3Z/nsX5PgfbLR5+gU8r77+goWe924htb/EtkdNBLbgZu\nAFtbt4RnqugQbH9hDjDNpqqyPh8aRYj4yeZLrMauLKwnhqK01D81cE2tIjfz\n9j91cc8i3AJVFyZqdCMC4AZKgvTUNpgWP3bTGCOIREtjETXrRKqvMwwE8AUb\nwes+ttGsljhsd9TKqfViFnfo0fNdbPywq0hA0ezY5nK0+JQ3KU4iluuH9NH6\neXCu0aRQUC0VKLTKDYn/hGUAJ1wYTRkmbwwp6NPHdUGFZG4nxLXeYdZU+/t7\nxV0Ql74KvP0R6E4fwsQNmqApC4fRtR/2mu05CInnVwXgQY6AaEa8JGlSB41s\nsvNAlcKIN/aAfELsO4b1CITqAhQRkasozYXiBLrOpjS+HttchLqM5Q/kYebB\nYBDpKfeTNMuzQ4syHKt/tjO3WSJF+uBeSKLb5eL17Sf4ghaJk45eFULBJ1Ga\nCbtk\r\n=BQGV\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/extension","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","engines":{"vscode":"^1.5.0"},"scripts":{"watch":"gulp watch-extension:merge-conflict","compile":"gulp compile-extension:merge-conflict"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","dependencies":{"vscode-nls":"^4.0.0"},"_hasShrinkwrap":false,"readmeFilename":"README.md","devDependencies":{"@types/node":"^12.11.7"},"activationEvents":["*"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.672ed38dc8_1578011089164_0.5865853537761463","host":"s3://npm-registry-packages"}},"0.3.0-next.df48af1684":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.df48af1684","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.df48af1684","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"b933c30d75c9251ed98a8381b5dc646ab413c700","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.df48af1684.tgz","fileCount":12,"integrity":"sha512-d6Dq48NTMQed0BSVMjbla3FR0PDxHJFaXadTYZ2Bf8UKFhHhXd99y6pJCZ6qKOokeP4hR2QJ+d15NoS5r88RHw==","signatures":[{"sig":"MEYCIQDVAL/UWLHC0lCxxaou/+YpmhkN+u64pbF2BYQLdeSdoQIhANVVrOIBdcJMteuQ9q0JKzVTpuTlQ15PSNtEDAK0Hh9/","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":110473,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.4\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJeD9sJCRA9TVsSAnZWagAAGlYP/A/Ms4E1ugEPJHffExR4\n66wFu/68TJ559UB1c8Mz9/r5OPtwwwkM+wlcRgZre3vTzxTwL2udPby00Baj\nVL5kux65gumK7UMHWjLZ9/LV/wQoxxLOodM5hnHi90bp2Emct9RiOXR6cWAf\ncRQrlSx2j06ic4yS+dY3vOZO37o4GH/QE93JYhxGVo0uhj/x5ei2JVD7nrS9\nKnd8Yj/rm4qVPZgItLukLKQ3kWCfZ73o0dmHOz8MvsBwIopTV3PBZ9UDyYwj\ngXTDgl0LO7gjPMfbSr9bgmrwCsE78kTh5kyIybwLYL65zV3vW+G1G8lV2vIT\ngd8AMirlzmBAzgCgXHAA3x9hGYuHuTcbV/kwv+HAtVAJgY3aQqXUg/w07ohh\nWdaHZT4f/UzSNL/7ks6Pwe5Jbz5SgRX2AscxwYXl7/gsJNNB4w3JF3Treyd7\nFk2zrWPTP4DRicwSlfvuhaHFgxdXw2Vp/bjz8aHYGIDjTd+dBy5aY/VbFJyD\nCqEFveB01HOO7Y5Fs3pVRrlAQD4cOpDyFYgf7fnMCkdvFpRbJLAA1lJFj2hG\nCrwYnaThy/nqvRcO4HlpHH0BRctQZ+DvF84xlaM5Hz/VJGInUdUqCZN+bg+c\n13ViuJ7yema7Decjn6z3c9yfcXam0zjNPMpLKaR2gCa5GLHyBYmRxXRQrhog\n2gr9\r\n=HtkX\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/extension","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","engines":{"vscode":"^1.5.0"},"scripts":{"watch":"gulp watch-extension:merge-conflict","compile":"gulp compile-extension:merge-conflict"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","dependencies":{"vscode-nls":"^4.0.0"},"_hasShrinkwrap":false,"readmeFilename":"README.md","devDependencies":{"@types/node":"^12.11.7"},"activationEvents":["*"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.df48af1684_1578097417203_0.016939068440054994","host":"s3://npm-registry-packages"}},"0.3.0-next.ee8eb463a2":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.ee8eb463a2","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.ee8eb463a2","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"7423a8222c8016b86af9d186f4d64cfc4c357929","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.ee8eb463a2.tgz","fileCount":12,"integrity":"sha512-7XSg4lvTkqs0y8LykNyKZ6/31qVvpgmHfmF7f60rj/xiORSt9JRNqkEY3TDaKec20VCTJfi/G1uWEpDFCAhMBw==","signatures":[{"sig":"MEQCIHTezt8u3emUPjYIHH/UNtkDHEEnYEsYiGBO/Qqy/u4uAiBWAyrPgiU3G/5IL+URD72CYsTPbg5J3T3l0DXEfxRcPQ==","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":110473,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.4\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJeEn3GCRA9TVsSAnZWagAA31gP+wXZBX/mijTLABhfDTrp\n9PjMPeRLiJ8Fbwuk3bBdAw+EHT6/5b0jcHfUak4WRZ+bsQbQVp3xmhzRspfk\nBYf20xhzC4Y+lPvplogR88hvsSl9f3TpHb3e335vUlx1cWmqk8g0Mz7SeyLv\nCzaPcbGsIj3xgEmW+2Q/1Gar6yTtFGZOzPS9SCh5D8zEzjQOfM5nlHjlr9rG\nTagBQ3pG6y8co2b+MMC5o5GsFW9veVI2WYeiE6wndMx5RC2Djx8RUvkhFRIN\nDHHTxHZJO7JXvJnkQ5Uh+wP+6Dje5KRkzo9Lu+q4qmFUkwsl8KJejoCSGLc8\nTT2yVJiFP5vOY6uUQT4NgiHkS+r0C+GqlYG/oJSQLfOh5fu/l8GUrkaixsJg\n/tNJu5jX5xbpnKc9Znmts2U+QF2gU8LtGkZfehlKZpPMX3Sm65W64Ikbp943\nr1zPYj+ZKh2E4wKK7J7DAipZoW4EQQ7nVBE5RfS2ifHBQON0SMNoz2iBXiiV\nmS+tiDZHScDgeJzx8s0M/t7/vYu0HPPZa9F6Xdgn6uvOjfNo33ZNT4a3FDus\npLUw2BFXMbkv9ERC2NmE3xK/4EokxayAO4ykKYEvxHL3GdpXlPBzJl5iEwrr\ns/alQlAloJ48FD5RBS5917RsXrVGvvSBNl4Vo+IZn14ldFMvs1h0vt38W4zX\nLVdx\r\n=qKRS\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/extension","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","engines":{"vscode":"^1.5.0"},"scripts":{"watch":"gulp watch-extension:merge-conflict","compile":"gulp compile-extension:merge-conflict"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","dependencies":{"vscode-nls":"^4.0.0"},"_hasShrinkwrap":false,"readmeFilename":"README.md","devDependencies":{"@types/node":"^12.11.7"},"activationEvents":["*"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.ee8eb463a2_1578270150591_0.33508346869591565","host":"s3://npm-registry-packages"}},"0.3.0-next.629a08ed62":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.629a08ed62","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.629a08ed62","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"9783357722edcd10bc99a2a81ee24fc71e431edc","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.629a08ed62.tgz","fileCount":12,"integrity":"sha512-ZTnS3sLENsUkWnm3qWEr7kIeQoIhYV3iq/VWMWTYMA7PRoQC7PtTma4pimJsimMvZbryLDGWXpzbPoXPTLD2uQ==","signatures":[{"sig":"MEUCID8u8jI6XGJ09jMc5pqq0JKVPGWKTxl14+i1F/QvxiOqAiEArghOiMPmlf3BTmpC70s9WJWMuH7k0CwU6blyvf/mpik=","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":110473,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.4\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJeE8+wCRA9TVsSAnZWagAADU0QAJjY919wnmZHCGoN0gx1\nm8WNB6KoEyK0BocmxzcoTnopNfHhgtGZnpFnd/fP4oCj7eR4lZOGB6dztc+e\nEj+4V2aufcM4Gn0l2KzpbGecJn5W/PdbG3cMIOxtKkAWs+l9s6GZ0TptuNxe\nyuY4Xvi5zoh3sSJOuDdyjlPeGa74h+C1hmRZnLeO6J9uamKwa1wwSQWyl0ja\n8WfyIWJMDmNK20AXV8rIS03yIHtwjAlTocHTvwSaPdOKtXFySg3EvtSDrPJI\noNH+6UqlKxLnmkEiXKERZUsd6Pjab4xOxWEGN9hF3ntysX4WATz1lR7Pa9Gi\nfqjhuLj45GinkkryJv44FcHE5tiu4eCe5gIlQeOMTGcKblSBmjYPDPI5mvxG\nYac99NA4WX+rRKjdPbl5Pr9pj6+tDswM9LBUFCXHe/OYHFhDqgtXTEbukvLp\nZLs1MyN1kVW9HhJoSe5Xr51VkGzikBzAx26foZ4kQwND8IPnt9/KFleNMGd5\nA9t705ZnLClQygNzzZuOm49B7zOUlf21G2aVmfbkr1RgrVcguYYUbAFOJU4A\nNTrsotxim8OkngzQ/CrWMctyXsM3Z4+4WEAnXMWHuFHqB1M2k+GWiRDx8rBo\nJrNd5wPsCJmghisAHPGZYFgYZJddQOMXJw/rprPye9+06zXgUvw0HEKPi49p\nSj8F\r\n=Cxc/\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/extension","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","engines":{"vscode":"^1.5.0"},"scripts":{"watch":"gulp watch-extension:merge-conflict","compile":"gulp compile-extension:merge-conflict"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","dependencies":{"vscode-nls":"^4.0.0"},"_hasShrinkwrap":false,"readmeFilename":"README.md","devDependencies":{"@types/node":"^12.11.7"},"activationEvents":["*"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.629a08ed62_1578356656172_0.7924808461736323","host":"s3://npm-registry-packages"}},"0.3.0-next.08d431dc17":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.08d431dc17","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.08d431dc17","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"fe9dccae04ba7ef0eff21fd9aff6dc5ac283c445","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.08d431dc17.tgz","fileCount":12,"integrity":"sha512-URltq6KhKw4of/3aG0017pl9Psq752pd/TA13/csVIVMuuGDFlclNQ9w01UHZM0gMcoqFo1vMUjVI21ayxQh1A==","signatures":[{"sig":"MEYCIQCgvucS/VcsZwKkHy96PF8MP1kH2cUpPvfpR8l8YsXPNwIhAPgtRlcNUY4K9RXtfSdXGJ/n5Xf6xsQQxrNn4elM44IR","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":110473,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.4\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJeFSCXCRA9TVsSAnZWagAA5/4P/jcVcg0RaxQrTa3k450h\nJUHBVyj+gnYlSPGUXD94FC0iu0yTiYG/MfvLbZGTaSJ1hrQ334u82jhNtobZ\nlXvCn9H9V1HlvuRBL7+DRf6qG/uBKY50DA1SnkNMNms0XpmhrEX1ff3OfXNz\nWn93v9KG0q9DR80iVeM7juUBO1EYFNid0yZYua8UgMbm6pA/Ar1W5jVaCiiY\nMr3RlRFmmIZwmbg5VehPuCEzmpe99d3zpoBBZLK8I4kCFedtxdD1AC8JzUWN\nwiM9PBIEXkDrCHqqjOZiuHAg2KE+jXU9RNkUpPvvoyA7bWFqb8gBY19K+apB\ngBb2ys8gOv7VyNDXqWHm8DyOu7dzn9SGqZ2sviUQfMvYRGvv/V+uTMjP8mPO\nYzDugyatjeqDgF5bHmam64SnRWkwjCe32LbH/aTZmzpTZemjIevzNCfgl8q4\nyrAqcAtOjOdTHY8MO2OHZLApN69iAwh9PvPlR+Eyah6q1u3sU2E9RiqEDDKF\nCxKxr+Uu7GzfscH+DLCsm1U+WZeFFbq3AJO4/QbmQzWbut3IinRTyQUqY2gY\nk3b/NA/R1ZOs/qJ+G01yHMHdSbrCWqNHfkc/mnpzgfUXnHkrUR0bU5630H1y\nPoVbs9JAN/azXCY4qzUvpyMMKY8oyjHFWHf+InRZ9Tyv+z0qXtH7Mmw7AOzX\n74rI\r\n=bQ+h\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/extension","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","engines":{"vscode":"^1.5.0"},"scripts":{"watch":"gulp watch-extension:merge-conflict","compile":"gulp compile-extension:merge-conflict"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","dependencies":{"vscode-nls":"^4.0.0"},"_hasShrinkwrap":false,"readmeFilename":"README.md","devDependencies":{"@types/node":"^12.11.7"},"activationEvents":["*"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.08d431dc17_1578442903285_0.8889271806502634","host":"s3://npm-registry-packages"}},"0.3.0-next.cb47915e3b":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.cb47915e3b","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.cb47915e3b","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"c5bb2bf4383da15cf345505995276419e276329b","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.cb47915e3b.tgz","fileCount":12,"integrity":"sha512-qPFCR0nIcIOY/rGHwDkV3t4WuY2YhgVipLh9nEMlYRiKfqSxLopN7gd+LHHMDSbhppR+AlYuDIQOcCJ3RgQogw==","signatures":[{"sig":"MEYCIQDicu7I6NHktp6m8y6EQCd4gMgDFMSPMsqt3UJlddW6UAIhAJQWD0KnPyaNBTtR/erPfO2o+oOaIIv31bbmOu3p/O3T","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":110473,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.4\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJeFnKYCRA9TVsSAnZWagAA4NEP/1SJK1YbBKIt37xh9Vf/\ngruaZpeKURGZM2CmVoGshF9o48uAecTo4VGHgbIEsQXfGGOVzIy9G7TD8JpO\nquskkrxcSwjnCtKuoRqdDC100wgQNXL52mMri0Npl64kdJ50HlmZl+YQvmoB\nISrwvhkP5IG6wDN3+C6SeUNE1Qfnm9NRFdOnN7oBWySBBJCVorv5AOStEt8l\nnMB5tHDyGYTMnCI8WM4PSFsGxYzd5FEcZrwkALOLs0emEuy4sqOVWrSk6kUo\nF5PXQ7Z+bjXw/IHjt/sTQCZYqy9fzSGzNGGSd4/vtY35Z8pjdXHvX0gosyVT\n1hl3MZI/v5J99IgMZfHYByFpjIsrS1Z9pMF7eETIYWFxo8/8NWh9QryDJ586\n0mZfnrkH92AhM4ZEaPPLNZuJmNwJlhmm24EtSCANHScjZeprQjxkm4esfdXN\niHki2IPZpEdJl0o0aIcmFi/zXy9eOK3rLhIVVrHHJkUlFqHaNIil+7IPCaXV\nHsyAB8/KXL4fIPtpNeXWmjAsVBisiXI14vxaSYMDOUbpIEjwznVkCoKARcUA\nt5WuwNO7PKLRPLTmxKfHyAxtVWgeXQ0LyPN0Z5Fpmw+hjlx1EpRdORlCNMwo\nZScPRKg39ZN1RGLFdx3gjfOsiPvV6QHVRJQVeAXah04ZZpRxefHJUKzIVsmy\nQjKl\r\n=a3Hq\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/extension","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","engines":{"vscode":"^1.5.0"},"scripts":{"watch":"gulp watch-extension:merge-conflict","compile":"gulp compile-extension:merge-conflict"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","dependencies":{"vscode-nls":"^4.0.0"},"_hasShrinkwrap":false,"readmeFilename":"README.md","devDependencies":{"@types/node":"^12.11.7"},"activationEvents":["*"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.cb47915e3b_1578529432281_0.10495972472330184","host":"s3://npm-registry-packages"}},"0.3.0-next.f6f9931377":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.f6f9931377","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.f6f9931377","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"0d40e00102fe878f0649965dd5efc4f99cd696cd","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.f6f9931377.tgz","fileCount":12,"integrity":"sha512-YJFi1soqtfCyAyi6QHwNto6/XnkRsLX+GQQOpxhYv4d9vRoMCXhOb0Om2gkVpbciSkxjQU4n56ymHDsGO84NtQ==","signatures":[{"sig":"MEQCIHRIYowBm1grmYzcghstnTcTBu7PuSoFxUHC2fszhcRTAiBHILBPAFKWwrL4uD9RyoavtOZ7K1cP8sHeg9HLZ/964Q==","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":110473,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.4\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJeGRWbCRA9TVsSAnZWagAAAHwQAJYFaieEVtLhAznAd7gp\nzmgpcTeIlBEWyL+Vo+CM2BCZTkqBQwM7QRdPp5hw8G0li990gQSFbZJeX8/4\nWDKom3ym0Y8edxF4GnZ4zjooBU8JGi15ZJZDt+cxcL3nYLSaD//Lv10WPSWe\nXR8p1PVcaICezXqpo4VPM4frsTwKWuqZjaMOuv/1ByHGU6Ak92Meh7iiYWUE\n8Lb+cNGheyzluGxC+vUYcgqWAxLCNt7FdURUyEr0RhSvK7aAZk6fRirQnbsf\naSEmISAcS2PSzEA+k/Rp6DQKNWdCLDwJvkKk6ctJQKT3C1hw/Ly43gHWgI3R\n8h/2PyyK1cdK+A1GhD5f4q5p9YOqgRdoU9AifhHmG5mSPcR9OZxlK/WpHYrE\nBef2A/cdlkYZQyTxgioBDoyLfEeP8k5XD2Z15rJG3Oea+p0Aw76jt+BSYJIj\nG7/rJfiz/GNenwi1dQdkQagNpMPBPZdDi/XaUqBAzbjJIfhL0akqmiEDwiBV\nsj2MY0qwUGR6UfI/Owx1P9LXzqq3jvTSXu0A/NdSTIsnPPsjfkVUWqsvGobX\nR5XVaB5eR94DDyHzwimErc0CLQ9xfM2OQcbTyJ0yo38wIKLZRGANeyk9CWwM\nD/y/advFx9tvDf8jFkTqyKWkkAOT97i57HS/IAg3pWbENI1zh+8bqmoxw7nN\njqx2\r\n=LixG\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/extension","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","engines":{"vscode":"^1.5.0"},"scripts":{"watch":"gulp watch-extension:merge-conflict","compile":"gulp compile-extension:merge-conflict"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","dependencies":{"vscode-nls":"^4.0.0"},"_hasShrinkwrap":false,"readmeFilename":"README.md","devDependencies":{"@types/node":"^12.11.7"},"activationEvents":["*"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.f6f9931377_1578702235507_0.9189391940997185","host":"s3://npm-registry-packages"}},"0.3.0-next.71df4b20de":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.71df4b20de","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.71df4b20de","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"9ef9b852f7dcc90a453a8a6f681d56566f8ceeb2","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.71df4b20de.tgz","fileCount":12,"integrity":"sha512-VLdcuuH4P33sRz6VUwwt7xltxPutI3isX4CYlUBhEkL8vkSjOZHCnxJWdV8GX10q/ywN0nyo5v0TEOZdgZ3nJw==","signatures":[{"sig":"MEUCIQCc9Z/51gwK4xmBNMhTUG/XHUoP6Z0CLBXPVFg2TUEcVQIgDP3/LQAlC7gngxMqrkOhh7+TzpqTuKc/P058eAZxyVg=","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":110473,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.4\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJeGmdqCRA9TVsSAnZWagAAUCMQAJlk+sO27eUVi81W8hjN\ngK11amT1ZVRaJ6QQCqKeK30tyboUZSh0fwX6vnzOtdEqhUH+y9MV3P0GJ3Fc\nllVmOVHHerpXnyVPkV33A4n1r16nLRyNaVUGLMAVdo1lSLrAQ6jCFCZgHuYE\nkAA5FRsi+ZZ1VbwQ66OUlkn/frQdNd2vvvBI7+gLyCM9JmgAKDQFfqEh9/pL\nZZif1d2CKBXQhkm8mCdvsQQVupMsokXcfH+CJN0ws/rFmESiXPkxZI+3T6T0\n9ykLKkIyMhDYhEkCg8k4CvHDtBEg/qSVTI4mxVav3CPrHy/BjgSpmFl2NAfL\nJROL4x5wmLn4qxi6bjaWV8PLvRD1Wn/WFWGifzDpeK+DFCcWChk45gSnGEEp\n4elQrnTN1cAD+0Wl34hpPHZaQvvvTLNireo3hZMyhJZxXTv4+gXHr3zH8pm7\nymhAuHL/4EmaiqcJ3IglDyvld/RiyMjLwD6yoC+EWw9P/spA8+mkih4s3bn7\nbivJnTXBQooOWMssP5WAaMB/vtXFMAo0IgU/d89aK/xPzIqr3CD6lVHgRBJa\n3I4tAclJcapnYzv04LScRprGiRIj4Qzi7mpHJ70GCzmX4Ea6cYWFY7z/3BQG\ndw9AdtHVd0QShHS7RWTFGqC3qvr8ytbseHRni9l1UGKxKd9uwmlh3/bdeEu6\ncOcb\r\n=BSMP\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/extension","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","engines":{"vscode":"^1.5.0"},"scripts":{"watch":"gulp watch-extension:merge-conflict","compile":"gulp compile-extension:merge-conflict"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","dependencies":{"vscode-nls":"^4.0.0"},"_hasShrinkwrap":false,"readmeFilename":"README.md","devDependencies":{"@types/node":"^12.11.7"},"activationEvents":["*"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.71df4b20de_1578788713838_0.46430451022020547","host":"s3://npm-registry-packages"}},"0.3.0-next.22e4d75bd0":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.22e4d75bd0","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.22e4d75bd0","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"97c3d30883a696fe8435617aa2aa8fc9e49cc369","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.22e4d75bd0.tgz","fileCount":12,"integrity":"sha512-FmlixHbQzzWe2FlTkTJW86aJyeCiCjXezL0M60+HvdEr0rTsN4CC2pHibcWgnqi5Os+9rOpCes6GN6xFG552sw==","signatures":[{"sig":"MEUCIQC4Yu1rXT8/jRpgMIXrT9IrJqEkAhI5mmjaZZeZDt9PsAIgZz6NHMlDk9KdAGWBx4T2USKUFl+E45GqGJQeGgcF6ZI=","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":110473,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.4\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJeG7iPCRA9TVsSAnZWagAAggEP/2FJfwNAGfHKDtyLY3Lz\nDmT3GCgb6QTHjx38bJrIpAxXjdj7pgN5ausrdqYz4LF6M9/eD58zARFgSEAt\n9v7IJLiM3Opg+P2ME5igpcF4cMo/whY61lahNv93VEBZXeKPdHGU+z9hzwF7\n3RIGUEXUmiUkFowkfX5ejqsRjDuRse06jHEpTYraLMxwGxj4f5wrT+mJ5eXi\nbYbn6b4LRHW7jqiPIijajkb8FT5LqjH9nrBVIYId1MsrvuaN3GjEejh1cKjU\niLw8ckmPbPytGKn66AKRPNFIcSgp7OEGhM4ZAQob3qo1RYnp+fvigGBWhSMW\nhuUFJ0vwaghoR0L2WwUK28qqjaSAttYuT3sJy2RhEO7eYocG6MnXDttuJtrR\nJLmQuAjO4OY3e2uLNH4brJvrnrsYt2yh7L8CxqzUy+1rgj1olLhB49zKJxnQ\nlp6WQEWODm695ZJvhiYJ+vLlgltlIWauKu/tQXH4p0+g9gvtdsFbNjcJmDlG\nHROVeL+3CAaisFYBa5Ioav9ZZHKyPSI+HH58vg5wuQLUpUznSTJrLZfJxLk7\ndAig3mSbHsIoZ+bRkesqi3F5ru+KWAepCn8sKSkB29R61ex++tRtdAzuJzsc\niaFTgYRV0t4iVQGLc7P1dL8X5agQ6YBSgCGZ9sRD/4TrsXKdp3sMBSY4JK0f\nlVtd\r\n=T8CD\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/extension","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","engines":{"vscode":"^1.5.0"},"scripts":{"watch":"gulp watch-extension:merge-conflict","compile":"gulp compile-extension:merge-conflict"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","dependencies":{"vscode-nls":"^4.0.0"},"_hasShrinkwrap":false,"readmeFilename":"README.md","devDependencies":{"@types/node":"^12.11.7"},"activationEvents":["*"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.22e4d75bd0_1578875022713_0.9167461640031396","host":"s3://npm-registry-packages"}},"0.3.0-next.2bbe9c5330":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.2bbe9c5330","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.2bbe9c5330","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"1ce9e644c406f70205c894754fca29aade5c716e","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.2bbe9c5330.tgz","fileCount":12,"integrity":"sha512-O6698LJ2DB97IY0jF5nX62tDvdYCWb5e/+ZZYZJi9dx+ueZzEPbAKKCmgnMVjQ10U40nIWBjpxT77slwI7Risg==","signatures":[{"sig":"MEUCIFLfV9YBEOptk9o2Qad67cp/yNi20e/un9LRfykjjx7xAiEAq5Q2S26vqD36FB/HdqzRIJD/e9+feTOzUKbaAtiu2uA=","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":110473,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.4\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJeHQnuCRA9TVsSAnZWagAAhXwP/RnRhxX8/un+OMg2492v\ngDuaYO8li6dSQRS2PupfnCgJqXjAf9x8wLdFKK6fC9KVP+Q2Oe045+K+QfgQ\nUa/KzcTL5p8qM51A93XC4Crv3qatv0AM4zbljnz+BvZV5Ukhm7lkIftXqKDM\nukHRQbIZCCO6RuU4VDFTqE1NuwHM7xgwdjfS703ud8ewqx5OJM5J9mREdmCW\nQSjb8ir6HrulYp5JH+MDBsmX+Q2+EuuRiWm4Fj1IX6ZC/BT75EBfnlMzqg/k\nNx20qEy+PcD1T1kF+fhVn5SSkMXdCjP9FGcqJPpcJnYUML8E7RRY9O1PMW1q\nuXlDlB1/TY6DydCZ/oWT0dZ+Jkz5WmOEtaZkQIOB+qJz4BRHml79IIwG0NB+\nuw6pgZq8Ek49+q5TZBqfFyxBc6FRYhp2+m9vU5JX9cn0UTNGZhgYoN+/99qf\nq38pvUhBxHNH+TXDQlwovaMciKIxwT6gymLjpS4SQkcs/MpIzNSFKvMYM7Oy\nOYSS8YKsmZkZTruOY8vJfo1VPyzVD0p337Z2gNDE5x5x2/5TcuhtcQBNu9Ey\n5QBX4GqsvK+UYNDzl5XU7I8rIQY99TDLAl+qcKJczcBOFCegchNhyRQnPYdg\ninPwyeZKHNLAnyDz5jVw6CAy5Mm7j6ikX9mg36/k4lwz2WNfUICo/jx81tBb\nJ9Ia\r\n=mKfS\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/extension","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","engines":{"vscode":"^1.5.0"},"scripts":{"watch":"gulp watch-extension:merge-conflict","compile":"gulp compile-extension:merge-conflict"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","dependencies":{"vscode-nls":"^4.0.0"},"_hasShrinkwrap":false,"readmeFilename":"README.md","devDependencies":{"@types/node":"^12.11.7"},"activationEvents":["*"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.2bbe9c5330_1578961389863_0.8423443590143167","host":"s3://npm-registry-packages"}},"0.3.0-next.3883ebd061":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.3883ebd061","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.3883ebd061","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"c0cb06ea8009b7a2dc7934a1e33116f0ad107760","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.3883ebd061.tgz","fileCount":12,"integrity":"sha512-cqTDKkfh9gmEpfJYC3gcRIfUi3hGG2ND5iNtzsr/x5BtTfFYEvFLgdA2tyNf0uvH6aNF2JO+6IBO4PBm3sTfig==","signatures":[{"sig":"MEUCIQCuORwDP3cIhVs2wWeUYY10G9uA1qRg6qVm/U1foXFfMgIgIdiFwlGhOXV8daT+FpbqLFLsFITtv+XfhOB5C8dc/Es=","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":110473,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.4\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJeHluuCRA9TVsSAnZWagAAlSgP/jwmM9BfabpLH2Bd97vQ\naCAsmXaQpOZfJeaIGemWL+gPyTzoexp/g7+tB6Prngidc5rJaY9a+rbCcCiT\noLfQZYlZQc94zTEsipYjdGChyZW6ryDpFEx7hyeaJWj7jHM3Ez1F+w0rmXzS\nb1qkIoKSAMR0EIphmm06BC8/ISmVR7sIC/c6HXxibL8KR91s+CKXBCBpabcL\nFJ8LUxOH0puUzwvYeNZLi8zlqG0nkOmE06satKzHkKy0fMUNMtC4LdM4aTE6\n05uSpcpozvwAeazH1PpxrslvE+l7ZIAUHi8/bdIgMzep/SB8hynfPzVdGUpB\nt/gliDzKQfOxesQgwKN0xtBNSFGJdPpsRTvvkmUPCSuQPaCSEG/cFObhuh88\nuephMoV4UBH2dBZjxOuHelo501WPtBu2JVWwvMEZl9D6Ttdvbd8KRDk+KyU5\n01WlFYg9nJ/BsMToRrbvki69+aMgre3dfQKHsjq7w4J7zrkAYhAJJ+b8qMZO\naBHdhSBe9Hf+LNnM2kF6hfOMu261Wy7vQ7faW9X7IsfD4aqRQNI7OqBUfRwu\nk9hjb+Mt8DyU7DdhSB9ySQbqaF10QhVWSSyC0GaraJmUbMoqHivHA8uf32Ar\nBACZSydUacs0u3hzPpuy/qmnIvhHZpS/50nPlsxMnBn5zziTSH+A5lT1DjlC\nK/GP\r\n=U0Fx\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/extension","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","engines":{"vscode":"^1.5.0"},"scripts":{"watch":"gulp watch-extension:merge-conflict","compile":"gulp compile-extension:merge-conflict"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","dependencies":{"vscode-nls":"^4.0.0"},"_hasShrinkwrap":false,"readmeFilename":"README.md","devDependencies":{"@types/node":"^12.11.7"},"activationEvents":["*"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.3883ebd061_1579047853951_0.9081737354763835","host":"s3://npm-registry-packages"}},"0.3.0-next.b80e813365":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.b80e813365","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.b80e813365","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"88648e64e4f7973ad9def9033f98b6107d8d96c3","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.b80e813365.tgz","fileCount":12,"integrity":"sha512-TLj66sWjywDON0c8JLz8fxd6pUptRcbkEPPweH5lGXY8gXNR6kSiMaKflwWYXlLlvTF19gslq58X6qctCYE1xw==","signatures":[{"sig":"MEUCIBxvgG2sMPVoLEV5p9liMskFHLy+1wYDylyovHrBUSPCAiEAoGAHscpib/4Xrqf9LMai6vPTP4aIW1/7ayJCEaogcXk=","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":110473,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.4\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJeH61gCRA9TVsSAnZWagAA+UQQAJ34AIPQfS3s4LWtplqE\nH4p0sRqmfFC1tODC09gH36S63iP9CO9vC0OZZG4e6jjGrYSQqyHy6ND1b7qf\n1txqQy+kqBc2bVqwacI4ORq1U6hVpHlh5JkVEIQiO+aKvbXymYyx5Q1GKTAw\ndHfgm0CrtoXXo3yjqT3pBHaXSQqkHrpJRj44TuCZQNEJEHrs2cZgYpITKBbl\nnhVBPw26+OmAEW0GnNmabHpe9tF+Tz8hZt9vWfyE02lCcPVhYb1CPXUEVCq3\nbXjtznxriSkqdXgBAEETs8j+XM3Y1d0GGT1+NY0MEhQHf/8dDHyJJjF6iy/I\nnV7POgMizh6n8gsEXA+HLW2qh4IhuVwGvD9NAwWcEzgwLCS3FbE7wk/D4Ow3\nkQ6494hB09SuhffSY/pipZ+FgkZ8tlLQEv2a6eR24F3kV1xH21JtWebmfByL\nzU3z0oWCBrGzLrENKdJ/atSol9+5NCkHXKReD1yNqKa7rcpDvxT0TLC7VjlF\n2bFfFefRHI5Vl9dCbR7YbsdTxouaHuTlcfY8/AWrKLTgqt4NejqIPPmwrKpQ\nfaRBQUlWm2JRJIv/jTW6cl2xxDDobbbYFfYKbVwP8tQipPznNZCb80IR2NPn\n8je8T3No7eq2dxNLoa5dVpGCrURaL1LDgYuHvkfYKoR302VGXY9erkHlAvp4\ntavb\r\n=vpyM\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/extension","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","engines":{"vscode":"^1.5.0"},"scripts":{"watch":"gulp watch-extension:merge-conflict","compile":"gulp compile-extension:merge-conflict"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","dependencies":{"vscode-nls":"^4.0.0"},"_hasShrinkwrap":false,"readmeFilename":"README.md","devDependencies":{"@types/node":"^12.11.7"},"activationEvents":["*"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.b80e813365_1579134303714_0.8686658665325993","host":"s3://npm-registry-packages"}},"0.3.0-next.ca635ddb28":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.ca635ddb28","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.ca635ddb28","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"242788aba3e867397c954475a5f4b92fdcc4e182","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.ca635ddb28.tgz","fileCount":12,"integrity":"sha512-Rv5cmefDTj1Ua4tygMiP5FwxyMu/h5RvqMEIWz2pucPjd4OJVbN4TmL/83VKcJ5aLb+Sf1XdogvK90WbBHMwRQ==","signatures":[{"sig":"MEQCIDyzbmFGImGx8R3waFTUjyQIsbNtj9o8wZIOOjPloJOfAiAKR9Xser0jJyNp6Ra3gZyYXGMyi3/Xd8ruqav+5/WJ4Q==","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":110473,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.4\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJeIP6ECRA9TVsSAnZWagAAKe4P/iwfOcbyWrnDrqYuUIlA\n5+u3HNg4aRyjgRobv3Hj/5cv3MIayboccBBmx/K4qO0bcTr+rbIaLV0aMBlP\n6nM+UzeIH+Hk8+Veu4LMfR49PY0rJxX4DJYd77uQ2WkHGzrkiTIL1q6w0qBb\nVYKG/rHd1y8U28NUVppZg4B9dbT8m573sIRpADkjhgcA3elCdO3UU4d69r0Z\nFYGlWPtNCrdsqwuK4V8wxR5zWXIe31MHm2XMJ9w8YFyULK1y76lbGf2WTODK\nGACu5e6f1wvmgJW22S6Cz1IWDn+7GoozausRtee6caIANuVdbhW6dsnZwqm1\nb8Fy5AoLtkYCMDP4ne2fzMtD2pT55GOLV2kz21LJyfbg5Z7gFbHl5dSbVWqo\nQEkOh42mi7o3o0GKKyR2SpJ0LaHaupqcLjU6RO+hwcLM89hrmmZNRWchKdy0\nvZire4mQ3I7Rp9TZTuPkgPRv/jpbkAZzeP70oDkyfSblzFgW3hI8a4A7iGhX\nnjP63WSar2/eKHecnliwefOd3I20IZyQ3Vc2f6NhOkL+mPYjdHcgQ3mEGEg5\nOi9iXWhcV6ZP6YQwdgm12RpKjJErE8Cmm38s9md9kJfO50gmo0oIiZ9nkWEg\nmSadwslbQsgiLItA9CZ/ejnOvQOLQHcgIdgCpmQhrowUWSAoP5ZfFyKSTAE4\nLBZY\r\n=Vty2\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/extension","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","engines":{"vscode":"^1.5.0"},"scripts":{"watch":"gulp watch-extension:merge-conflict","compile":"gulp compile-extension:merge-conflict"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","dependencies":{"vscode-nls":"^4.0.0"},"_hasShrinkwrap":false,"readmeFilename":"README.md","devDependencies":{"@types/node":"^12.11.7"},"activationEvents":["*"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.ca635ddb28_1579220612341_0.8335195565380638","host":"s3://npm-registry-packages"}},"0.3.0-next.a234f13c45":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.a234f13c45","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.a234f13c45","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"68f36dcdc793b78cd73ddb30719e6a8591e07125","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.a234f13c45.tgz","fileCount":12,"integrity":"sha512-E8Od2D4Qaps4N7PHloMPVUyVdxCamkv9OlrQYcJ2O7rVYZ5rrjm7UVLsw8PaOODcKMFV/vPGDpgV1SdB6vABOA==","signatures":[{"sig":"MEUCIQCa2Xz1x8af130fHyrFkBcAOj0PL5hoSBWXR8L/yftYmQIgVvmUyPI3v25ag36zA76lqJvagpVRCK/vboFGtdi/pso=","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":110473,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.4\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJeIk/LCRA9TVsSAnZWagAAhTQP/jAGeBHV29VkLaDH6hyd\n1UorLn/FiiXGH3MPJYZCpJBqLqXPNDkLVYHruIWyMhgnMoW3Vw6Oy1LqpZ8f\nYU3qDwXiF3QfhKDEb+RDKkoUhhAo1bmcFuC2EtzIeTGGel3bY50ZeoEWzKue\ntb20wNyNunN3ov6M1v2afE0Nz6gHzawchSgKW3LFrYTTVw2bFecrjSbrBmyK\nQW6e3gP/vHQmU7saO+w6aisgGxVAOWtoqVYVF6JcEL2gEjYEsJAZJ9c0MwPl\nXTtxqScJI1oADn1b+8Citgn2iLrzTq+WlMa5nGe9ArbMKYKZ9UDQtf/05tya\n3xilcqgggdn9JXXPnTqnu028AAJHIOKEfnTHvjuV+5FQqsJxz+i3Sw/ygqIj\ncE/GBlAsrvJsWgmVfOLDNmm6iHV+xO318TnEBOWOxno8cl0Gwvfuu/cegoM1\n16pwSh4cpz+k1TTDtS5vCvk6fFKAYILjhVsgO8Ra+H5QGrg9R3RrICP+bOsw\n4bMayBw5wQTNGwV8BjWI/GlL3ML9quUi+IKaQtVFGki/JMsvhTRQ8KsWE2+b\n69k0SEbITcqzEIWK8Jre5/1QH68eE7CsXe7JFI9n5824iBZLRUU2baFBOiYX\naHNww3Tfw9hXLnUUCcnhRvOxV4HGUbFZMn7sE4oieMnOWwmiDSrUCTgBkyWN\npLnQ\r\n=Gsd/\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/extension","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","engines":{"vscode":"^1.5.0"},"scripts":{"watch":"gulp watch-extension:merge-conflict","compile":"gulp compile-extension:merge-conflict"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","dependencies":{"vscode-nls":"^4.0.0"},"_hasShrinkwrap":false,"readmeFilename":"README.md","devDependencies":{"@types/node":"^12.11.7"},"activationEvents":["*"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.a234f13c45_1579306955261_0.7037975148405629","host":"s3://npm-registry-packages"}},"0.3.0-next.062c54a424":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.062c54a424","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.062c54a424","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"6be4f4eb5a24c13d1bbcc8a32fc12df1ad109b25","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.062c54a424.tgz","fileCount":12,"integrity":"sha512-z+BykU3xMKNkC+ZkgNBv/FtcEytkjOnl3GoOr03WWv3iRQvzfGhsbRfHXKfZ8Cz7uZ0YCmrs8W0KManCLBp7PQ==","signatures":[{"sig":"MEQCIEygYXAkWscFMvfPmcjuqO7d3RFftiH6WbGF82gy03uCAiBQ+nVSkw0FVlWzLgcFyo3Nfv0AYRnG5v7i3kWSqugcig==","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":110473,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.4\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJeI6DqCRA9TVsSAnZWagAA5ywP/2OA5s0Ud1/IX3TB04fH\n+1W3y1ybaCTmShxLJ6goOgH4RMfgRY3CilZ1HMZItlPLsZkmRIf0S+8jyD8H\nmWRARZ6UiwOo7cFJGEoe065ifzLl7xrKNbo7zxOR3+omvk8XR/5+csaJoe9/\nyhtk03T6KVoF1V/Q8Zdv+ZLdV43mTfi+vDOeJdV0TGOJqWhTfEipmrDRbjxf\nZFvbreBoosbjbfaXa6T35J/2RoZ6SR9Z/OHUYVG2RwUrpEPMMsuqLW2B68Zd\nChE6bX/N0HdlAGEayHVg75+vZZJz6SqjMiIwMWi8dhER4vGUY6htIyXknv5i\noXQxL9ITFjLX9EBXHhp3WZ3sOeu2l36RBQTIwtoNkJpczzKXk2TSmzNzCERq\n4NoSBNr9ovmKS7DZrOrCv+bwDMiK8dzEUlPLJlUKLDEdWePYBThng+YK7UE2\nnYjn88MpJeVFXdbEWDDM5i9FY5tecE+oBTVZ1q0lqeEe5W4yTmdrRjdNN9Hj\n3vc1qpt/zu4ZSktcjuyZ0VyCGGmEacxJ7lG7S/B5aR0lK0PJpryMCkrqyf2I\ntDm6PTVxIqM9MCzekpRQZrIxm7zHHaiszT0tiT0kCuqU3eOon6KDoJzqwCN3\nbGc/M+9SOYmuRmRDNeHqXzJOZ/molTgY2ASzU/UBbZreT0zojrxy092hZbNo\ncqqS\r\n=2U7A\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/extension","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","engines":{"vscode":"^1.5.0"},"scripts":{"watch":"gulp watch-extension:merge-conflict","compile":"gulp compile-extension:merge-conflict"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","dependencies":{"vscode-nls":"^4.0.0"},"_hasShrinkwrap":false,"readmeFilename":"README.md","devDependencies":{"@types/node":"^12.11.7"},"activationEvents":["*"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.062c54a424_1579393258392_0.5792039209846518","host":"s3://npm-registry-packages"}},"0.3.0-next.e107e5c5bf":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.e107e5c5bf","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.e107e5c5bf","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"bb8552756e78ff4a1b0edfca8f127cb52dfd3612","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.e107e5c5bf.tgz","fileCount":12,"integrity":"sha512-eCBLF0+nW1V29cFpSlH8SL/dEz56CDIRw2NeIojsGuxXx/Cila1J9D+DUMOu+zkFHYw7lAGYKIGFqH43nTmvaA==","signatures":[{"sig":"MEYCIQCPZ98WcfX01mPenHnXBRep8d8sPbAh1zLsnyhw/5mhAwIhALHy3PUoAShIrYvdBYy+//WXeoPMNnA9eb5TIBczY1gJ","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":110473,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.4\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJeJPKYCRA9TVsSAnZWagAAaq0QAJ3Koh0cPbasVZtPg9FM\nkwogIkyFqlJtpIUmqnkoHFwAI3Opbey2stlSipqhDzL6y8I+xY9RK/0hqllK\noJE7nyRXuMAfOuxpkvNlBRX2zqG+FFNHbqdCXrxNpNzGBLn6xDeUaI/zz0OV\n7opjb5rgQTuOgt2mWBRDdgaO3kOO4Xme22filbZNGWv0TEa27S4cRmh4RM+N\npwqiShNj5VJQMA8asP8vYKJuBRbWdzUFPPy7y1fRTzvGuBS8kxtqU98AebTH\nUhsCPjJk5JYx1reKJc+oif1BcheQYTwI74Crac20+0oh3KPxJ7UAfkt6G7rI\nL6K4sK+EUfJttAp8KDM9kxSd1ob7fpgp0dWfoRleOKLnBtsaoZi/kPb+eSUJ\n4y9LdWOHTCCC4/4D4dB3oiYG/1IbyssL4LzudIjN3+bOQxM27oVWh3pHWWXe\nz04hmbZrZcuxfE/nf2vw9jOMaM0IUvn11oDsAHbSh068dN17Gx+8s7IKBqVN\n0XG3nz21NEj0O8GDHxKPr0+hnjRlmSQqQo1KUjNR1vK8zSLrgPYw4DGcNE0X\nlewxmOta3cCbNqKkvrH406SM/LM7GXSeLwehw0BHiM8GJK+aVInQCerHq/cC\neffE45mAbylocR7aDMo3QIYdm2Po16B15ti4QtFP9O7wV/DeoEo9Bo1buhnA\nWqpR\r\n=xPEh\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/extension","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","engines":{"vscode":"^1.5.0"},"scripts":{"watch":"gulp watch-extension:merge-conflict","compile":"gulp compile-extension:merge-conflict"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","dependencies":{"vscode-nls":"^4.0.0"},"_hasShrinkwrap":false,"readmeFilename":"README.md","devDependencies":{"@types/node":"^12.11.7"},"activationEvents":["*"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.e107e5c5bf_1579479703818_0.6479376683362259","host":"s3://npm-registry-packages"}},"0.3.0-next.8884913a17":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.8884913a17","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.8884913a17","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"3710d90f3735ac12cdfd373c03521231ffb61712","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.8884913a17.tgz","fileCount":12,"integrity":"sha512-LAvjIeb5MeLZc4bVuevJo3E2eJXDDfGABadViql6cun0I5FdbhgWk1BVDA21U/H3ZF9ZpVegGV7r6GRQ6A0/Tw==","signatures":[{"sig":"MEQCIA5PiIo57n5XsLe0tELRKTY/soylgKXLKKh05PrG+SyuAiAhnWEQr+MPnGinBkEQ7Hgn5YKc2kcCBz+be4+keKq52A==","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":110473,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.4\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJeJkQvCRA9TVsSAnZWagAAmHoP/jhGFY+6kbivdxopIk5I\nWgqVLUrqNuyBjLQAT9wFx6DMJ/eHMaOUp/9wuBiQCsqNLv9m9Ngk1fK4uHym\nEk+k9JmPrynokYO16BnnDpmAKLHXs5i2r18R/weKDDlF6W5EWSsReMWsb+Oy\nceGfjdE9X7lvL0ltbo4c18kqlnER+O0lmIA4CjnEqUN8ULtHNajCVEZjPswC\nhhRZ9tWVgNnSQclzbswpDhVzv4I60S2roI0zbBa+uEQJ3p2ABL/4A5BLGaEl\nJ/yI5TSkRQK5sEV8cncS33r8YdYGFXaKRVD92YtVnB9nygoI262Dardh8GxF\n9pgTgkPzkq+Pj1ME2Vjok74lFqdHFWE1LoVFDMUeAcGKBgPUNo3QarLjMfgJ\nmPZd2wR9u3THUjTkzp2LM4AbzkNceSeD6y3NDTzRPLHnlnDiPOmHXVpZ399A\ntthtWv3sbnPNXadFH7RhuUhiU4mUoAa0AyM6TKjHEsJxgosNEq5fBt9mzZM4\niCUnBwCRRa4I4ykWd4XmK9HmisBhn4SrpS12ZMn+LfEjoU2v1oCB0LTahnUV\nY3R93FdMQ75wDEMumrheXL/hxnEGXcvYC9i4CnuEdqy6uKv5A4jdwhH7CCqg\nc+fnndFpYyRS72f0P2UBhYSmBcmpwKsa9y8hCNzgm01spocTEsBuLn69vyXw\nE1cO\r\n=vFTB\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/extension","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","engines":{"vscode":"^1.5.0"},"scripts":{"watch":"gulp watch-extension:merge-conflict","compile":"gulp compile-extension:merge-conflict"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","dependencies":{"vscode-nls":"^4.0.0"},"_hasShrinkwrap":false,"readmeFilename":"README.md","devDependencies":{"@types/node":"^12.11.7"},"activationEvents":["*"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.8884913a17_1579566126263_0.2932776374646211","host":"s3://npm-registry-packages"}},"0.3.0-next.d6fba31514":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.d6fba31514","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.d6fba31514","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"43c9cfca7ba46f173dc84de0f07c4e9fdd20f411","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.d6fba31514.tgz","fileCount":12,"integrity":"sha512-XbGAgyWGUDwHKga0Vdh3HiPeq+ome7tIPN/WhVcW+FuNHDNwlNNDKChUXih1U/Ya2WthibF0jiDjWK1LQa6rqg==","signatures":[{"sig":"MEQCIC5rK3xY5LY2s3fyeNOAivZdRLlvgouEXu6w1XS5QDCuAiBBUZjoGLypZgtZsCz8mDEaM105zRul7f0DFUyuYEKSTA==","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":110473,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.4\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJeJ5UoCRA9TVsSAnZWagAAGJIP/jKQOMTFMN1Rds+V12HZ\nh6Hx3kgGjyPZfPI5ewNcQuDKkirPWrBfDa2fZNZ413l1Po5h8zY9Z0oVf7VC\nlNzbBT2Cr23SJDfrkHY4p8J+ttHc1NQ4r90OwK/nO4AB26jy6k4j93BTnkJS\nU6jffW1rXbCkW31Ub/uA467O8m7UlbnAUDS0vwWxlLJiHnfpfnpf9StI1UMF\nVAQ1ZpstjUMi3mrikKDDsYkZoCwaQLOS138frT+KTkb8N0HeejyogiMoqkMU\naqV+FOG6N/G5w7kJoovjLY7Lny9IhwVWiIY7Mxg8KA+urzzFU9haUQhU+5Bn\nWg2pr/M2/LwrdL4cFvWrjTj/gcfWz+Ncy4aT4ROWF4/3zRGu6fbJkHoOSPn3\n5gItaWzwPGuJLY8u3QuS84jTFAwGeyD4A0KOocLCJPOZwFYgHYnXWZGGVvYZ\nTg65y/i2H5wmRJehsfhVoBgKBUYuMAG9NVv+MC9/J/wRznAw01O67YurKFSa\nY1VDe3urw/iKs3RYXarHQv6uKtE6Mn8fE2S30d+fbUOPIa30zRpeBkYqR/y5\nUfgRpc2Mwmuk3aRm9rKNcibLjwvoNjBDKRCvn/GeR11Ahaj2GWR3Eau4Evo1\nCVJ3TsR2cfJ5oCkGIgGuBUUrCP9wxWVLCRCrdLZxQXDRp4d04t8pVWjh57wQ\nvInL\r\n=6fQx\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/extension","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","engines":{"vscode":"^1.5.0"},"scripts":{"watch":"gulp watch-extension:merge-conflict","compile":"gulp compile-extension:merge-conflict"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","dependencies":{"vscode-nls":"^4.0.0"},"_hasShrinkwrap":false,"readmeFilename":"README.md","devDependencies":{"@types/node":"^12.11.7"},"activationEvents":["*"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.d6fba31514_1579652391607_0.2562577479306152","host":"s3://npm-registry-packages"}},"0.3.0-next.a90aedd5ec":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.a90aedd5ec","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.a90aedd5ec","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"08190e879cefc5e2f218537abd6b1816ea0a2b2c","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.a90aedd5ec.tgz","fileCount":12,"integrity":"sha512-tq8YTdSavPa8nvJLJ49dUUzvj9aE9/jGsSXX6wPmMOlb1hA460WUmQCEqOALWkQ0uKELYdDBVuHrpTEJGxMNXg==","signatures":[{"sig":"MEQCIBxbPF2e5rOvXLWXGyINErULCJqhIDoAHboOjWCvuCFaAiADqPPYMoTDFGPFO2P80WeRtum0vncpQwINdo+25DTr8g==","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":110473,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.4\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJeKOcoCRA9TVsSAnZWagAAEzgP/0M5/v/fRSTkfeJUnlZ5\ni2dSIgTpTA4g4G36wmQaqW9kNMJvQGLxFoARZEwDmD3EE+0DomrNREuHSDdG\nHDhgbA85D6B78rR2nnb4ugZXLrUEyjJ9/DJ45J2hJsijB3/JvDToDknHPpza\nff0HplVdIRCpEIifGmPEveM7bQitS0Ms57/oWnhQzbzbQLOjuwWn3t56wdgq\ni8scIJxoYanmOASp99/CerlXs1yk8ASLI5ZctIrkJoXeM+RdcpEVbjKsloDC\n03vNLj8a+6hp3ntadQhpq6SSrMPxFaOt7VV7cz8kdXepv0/2X3TwPN2DZiK6\nHZKORWdNr4l/gkXbCMJHVdP+4arWqXU8bMFm6Too1nmiQxuhsl15W7T6pRzJ\nrP/fPjWpl0gyfyb8s7xJdZJvJ4+fLRSDZY8HNnR/ItpL6FsK/eJJBJg7Ke3u\nUHEXiAC/HiFgs7GlLAhDndD3XeqWQ0LT07pWMgkrf1VLwO4E0kdA/D37lnMa\nkpnKm4ARyPNM7Cm9aLnm6X9CVpilFpQt2aqVEFfBl0WwjZ5BegEUd1Mq9r1L\ncpPbdtE/4b6LEC5Ks4y3hjQMdY4Uptc4MayEgLpYtdxwsz5iwasu1vOeCyz7\n0bBzmH9bPubtriFHoNTYE5EWe/sUkOvg+MN+t3e5NxP5G2tVf60uNoWCfbBh\nb+qX\r\n=x47F\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/extension","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","engines":{"vscode":"^1.5.0"},"scripts":{"watch":"gulp watch-extension:merge-conflict","compile":"gulp compile-extension:merge-conflict"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","dependencies":{"vscode-nls":"^4.0.0"},"_hasShrinkwrap":false,"readmeFilename":"README.md","devDependencies":{"@types/node":"^12.11.7"},"activationEvents":["*"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.a90aedd5ec_1579738920315_0.9749339360322269","host":"s3://npm-registry-packages"}},"0.3.0-next.b60f43d098":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.b60f43d098","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.b60f43d098","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"e96200703b7cea0b1bb9a95e7fe6394205c4c8c5","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.b60f43d098.tgz","fileCount":12,"integrity":"sha512-Ot5WROfq9onGuQKRoEJKnNQaaXXyeUxS8lYVLSgzgKuONQuvYQa8I5JFgRtHqjVVGjtJcAU7l8+aT339mudHnw==","signatures":[{"sig":"MEYCIQCHr0DOJAm+QMgmkFRZhjI3CTMqJGi7//DLek0qRBIs/gIhAL0R4ZSZ6MVuVhB50QJiQE6XEpNFDPZgJf7PEOOEwCo2","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":110473,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.4\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJeKjhqCRA9TVsSAnZWagAAMGMP/35pNZ6yRzF4Ypj6l+1o\n5+oU+YtyL7hUZzgvbquS8GvTi5PEWsnO2yy7Pgd0tPVkw8Vz8R58FjAI025f\nOyT8qZ1bQo5ASgSmOTYI8oEbT4PqkPouMt8ir87aDITtoCzituTc32phhL1t\nSNgiTtHL3hy8cZ8WLMfZWjAejYsP3CgQxCBu7lZRR2jW1EFygBUWc9rnQP+p\nC2seJYVQO/PN5gMsjMiXQlRUiiEGo1ej9ZD7dKwL1QAd4AWb6sRVLyKgaf8T\noRME7PhlSsSReG0pbez/ld7LBxweCf6+kUsFWoWcSyGstYg/OAxefqLGu3X2\nQ6FCSVuaiMZGC0lkfwJsG7DlN4xnRSVHPvgQ5zhKmJE+o1MsBbhkPKqS6+Tg\n9Id/SRpB+XOJ6ThdAjJr5meRe6lZQGmWGnA7hgFM2NF+wuHPTl+UUWAml7zr\nOqPHYARMMVWSr/cTdy+XczEGPPMFJlM6nmDKnvLTSSxvXO8mAMtlJy9WrntF\neyLWAxGAtsh6qQbIPmPRjzTv+BsjSimKewjctzHn77vQG9bo9nH7DudlEbDU\nuWmeT6EF6Yx6pp3yGHxuGtXlR//6Z7GRwS9D6zI2/hESvIoM/ctcfqVYS1iX\nwx1k+U2ykWjT1aZAlPZxgckpJpe7DDc5VPvOeO5mVPprX1vS4mTpLZUdAmZ6\nymxN\r\n=4UiP\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/extension","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","engines":{"vscode":"^1.5.0"},"scripts":{"watch":"gulp watch-extension:merge-conflict","compile":"gulp compile-extension:merge-conflict"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","dependencies":{"vscode-nls":"^4.0.0"},"_hasShrinkwrap":false,"readmeFilename":"README.md","devDependencies":{"@types/node":"^12.11.7"},"activationEvents":["*"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.b60f43d098_1579825258185_0.30615079734852113","host":"s3://npm-registry-packages"}},"0.3.0-next.3a1e245648":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.3a1e245648","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.3a1e245648","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"ab235d131761f6d0b8c4141c497240599a572869","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.3a1e245648.tgz","fileCount":12,"integrity":"sha512-v4kJaenhNVlskMvij7+aRSipMdiJx+5a6dJy1i2+4mmtLI6ahy4zDYAqsdNJ+02igUZmt1Iq/s2+WvU82qQ7ig==","signatures":[{"sig":"MEUCIG8yDY8tkWsJSlUZZIOQSO0fESVulKc2uxgmXBP8DadBAiEA73M1L9aNaA/N49smz9znKmruDd0SvK9019Y2ygYunn0=","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":110473,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.4\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJeLNuECRA9TVsSAnZWagAAz74P/RMA8ToDy/nALOqhsT3+\nKyqUMni6NsmYw3BRmtL846P9Vz5IkQV+xesYO+knTJKl715Oji4XI/9I7dZC\nMklxDA34AKR3p/h+0CemSlBFgJqk8C37Jb1kypM74ECjXELWuJIOT+p54QPQ\n6UjmskQ0Se775rQT9DKjhtBm90gXTNYEi1b8rluX/TBWjD9G+djsp0Yd7Zzy\nCg5f2H1TfhYegTgUq5cLyAi0b7ecvPg10zt2CWCq3zV0Ar3Uk6WYp7o8ZYBj\nsIKZrOYCqLH2kZRHXDE7YqXkpAwbvbiJJUlXVs1NWRWa4t2X8U4C74eE6SIt\nPMZ7/mP5cuCG39DGtavMpiepYb/O8H64x2ckEcs+2W171/v/3o2gIeCO6Fmo\n/QOZtdJfzzOlB9YxrDPkoCrhX5r2e2U4CRgNj9FkpZVWiYnEfRvW004YC843\nCj7wrwDVUQaGvmB2Uxk3z1iJOp4lLiylLn7udc16YRstJg1mej8DWLRaieoi\na9Ic+xmfQD6zuA+Odg3IQB2z0pf5qURGXYv5I2yFpVJ07cO7kXZZ+WfiYL19\nN3iNbEsGpxL5wsyhEtQTwBtXIkMNJ74dWiCatr/Bjy9Y1arNRebJL8QiwY//\nQAocFsAfroBdpReqa2Sg3qboC4Ck9Z2qrg7vPM84qpBl2p0ZenelbWaUqweH\neUo1\r\n=1Cy/\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/extension","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","engines":{"vscode":"^1.5.0"},"scripts":{"watch":"gulp watch-extension:merge-conflict","compile":"gulp compile-extension:merge-conflict"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","dependencies":{"vscode-nls":"^4.0.0"},"_hasShrinkwrap":false,"readmeFilename":"README.md","devDependencies":{"@types/node":"^12.11.7"},"activationEvents":["*"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.3a1e245648_1579998083837_0.9602606601194501","host":"s3://npm-registry-packages"}},"0.3.0-next.3c6f6af734":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.3c6f6af734","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.3c6f6af734","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"67a1d69cec391e871422649e9a71f9b9f0bc2577","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.3c6f6af734.tgz","fileCount":12,"integrity":"sha512-DxT2GFkghtBYyEGtDTuoulZIDHr3wWk2QDJke6tBXZhtvxXx3KzeZzSGFbs+r0EwzK/ByMosmfQJwyFXYIHT/A==","signatures":[{"sig":"MEYCIQC/767BAJytESMN0uHXSDJr24kKNKLXYhydjAldgNYRfgIhAK6K97k1U6sVIdWn6KnxNMZ0gUpsxzg9i+bTNTgOnVwN","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":110473,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.4\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJeLizPCRA9TVsSAnZWagAATxYQAKGmqoiAze2KKkTMQEDb\nUDsiry0KIezXnWS6M1PHGb4U+MbSefmz95e6kRgmS2Y4mXYvun3EKKzFlbd1\naT60Hx3kDH1YC9MdaZblf+ap1/LGBVLaeT9G5kXlRMIG2zavT5U0dxMvSNq/\nqxTkAl4Rc//a/t+WK3c+j8+0C8bESW0mIs3RNrTFyPwrPm3Agy1d3Iymwli7\nNe2befo1d/vpwzjJfPQehVRhGVlDKU3AS0ef+SRvgr3YkyK1mlL9OzKzkxXo\n4n/wNaZsYbIciNH088NU5G5fYyvYPHYXfg34ovFw9AZRs5aI+6l9zat0GWM+\njvODB6197efKEXv9xGOoQFr8YZomzzci3gPKgIZB9FfT94Fi1Ij81HpaHf23\n6QJ/bgQ4pZUJVGHEdjkJSaYFpwLv4Adi5D6L9aKEOTxvZNzBlfYf/KmLr+YA\nJGpX+QV3agEOB3R4LTAms33oyu/obGynufxqBBewnLRZV86+RfLxmWWgmV0e\nba+23KTkVY3hCduNMdFmG1tHxs5A++dhEXaH1dvnnsKO3rE7IIy4D/W2Vv7+\n9lyMA5LzlfJ4tDt0Ou3DaYAJjv8xQ9EEBGFleE9DuBnKrAwTq1DSYXppR4EA\nBYmxJAaehOkKv5IQ9lAQvxxaqmOVafiygVB0AETgIKpE+Ext3r8R5+4mRjGc\na6hy\r\n=+jVP\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/extension","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","engines":{"vscode":"^1.5.0"},"scripts":{"watch":"gulp watch-extension:merge-conflict","compile":"gulp compile-extension:merge-conflict"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","dependencies":{"vscode-nls":"^4.0.0"},"_hasShrinkwrap":false,"readmeFilename":"README.md","devDependencies":{"@types/node":"^12.11.7"},"activationEvents":["*"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.3c6f6af734_1580084430585_0.20476756679392705","host":"s3://npm-registry-packages"}},"0.3.0-next.4eab357eb8":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.4eab357eb8","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.4eab357eb8","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"3f169acf942725d853154b840aa537f1a093eff4","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.4eab357eb8.tgz","fileCount":12,"integrity":"sha512-BGqqD6eXnSuT0d7LbTnN3iIyH477DQpRdY0Q000UHPFyCRHhAapO7dymqazXdrlAoiedZ7ZyvLkW1O0r0bup+A==","signatures":[{"sig":"MEQCIEpBcpOODGILZLqp7RNObW9YO/nh7qF38qLjXJuyBETaAiBErGB605ahrMxudSy2ZchNeiGlRhxMoxyslqt+T/kpAg==","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":110473,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.4\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJeL350CRA9TVsSAnZWagAAf5QP/3WfqktPwq6UP//OieX3\nmA9Gf1vQ5Pj/KOuesOrXtkdIT9iGZ9/wA+OUKIr8GcuP2VjTUZ2GKJGvf6wA\no/GUxw55nAZGr99uOyLnlF5dgMr6Ira6+O6xRXtWmbRRy+fs/vqE3zDpHFvL\ngCcnFb2kDLinKX/yyqPQwZI79KV6PEG3DbeoYl9oWXbPGZ6Ac3IimwdLDueB\nbGxyICMAWqPIuxmZw6IouRGrjC+h3fWn386mVxtsdwD+6LI5ekV9ovBuPCa2\nx4XrVTQ2Z9/BPvpFr5yyE+V3+vq8y5Ibp2d/WmJbtLJbnH3IF3ue1/9afhpn\nfDOw7VxVdF8WSri1MiYSn2ARKF73LfRZsc1+LX69SUQoAeAtJSBdIhXZWCy1\nKdjdk8ZMnyLYAXsZ3ktvWEfTkRgAw6QL1IrXDHjCuwKBKVazwOTH1hoTJf9X\nKXSdyQbPtEuEesj5HB1/zsApiZENZhgxzPK66WPIrjO89nqMXxvl86yc+Q0z\ncct1fHatCfEg7oh/ObKQOU8R0YrJ1SYV933mgSs0fIK+Fou1Q4q+YpEIQUYs\n8sYGDQv7nPLJZMOK4Q/rNDzpzGOWSDaQKQ/V9DYAc5v9B1v2KHYXx4E8x0cJ\nEJ36ZEdsB3XuTAkSlDyRzg/hazL5Wa57KRAxIgWcYv1UEWxUPYKHoEnQqes4\nsW5a\r\n=XO8G\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/extension","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","engines":{"vscode":"^1.5.0"},"scripts":{"watch":"gulp watch-extension:merge-conflict","compile":"gulp compile-extension:merge-conflict"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","dependencies":{"vscode-nls":"^4.0.0"},"_hasShrinkwrap":false,"readmeFilename":"README.md","devDependencies":{"@types/node":"^12.11.7"},"activationEvents":["*"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.4eab357eb8_1580170867301_0.035569397427377636","host":"s3://npm-registry-packages"}},"0.3.0-next.d99bbafe17":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.d99bbafe17","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.d99bbafe17","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"e68087455229fd3241ff520074596437f400539c","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.d99bbafe17.tgz","fileCount":12,"integrity":"sha512-AQ1hlU9WKsf2WA4y/u76sHGOfPjqytx4Xzy+GnZkTpa1Z6gdd0B3vHh6zZTqbcLK8O+U2RoYBC9DOM2z+TFaQw==","signatures":[{"sig":"MEUCIQDoe5V4mWYChfhdPjoZ4NatNzpjnt7NCAHKr9IDNFyIngIgW0kwkmE+j5y5YKVaquRLJsj/N0YxU80+x4VhsKuLPFg=","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":110473,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.4\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJeMM/rCRA9TVsSAnZWagAALQAQAJ39Tr2zWifvd0UFg9Dl\nMSQMy6L75FzVbVhAo3MmIQbK8NuPRoMIAvreVEpr9oCBEHRCL99qJEhUUSa/\nQEEfd5GcibrWDKOVQTsdVr7ejb8nnAm7kAd98KxVh3uQzVUkCXIU4W9M3cZc\n2xZ7Ufjor/cXuuVSNrPjwn4uBoa2SqHzhk6Ygjh6uWFDmxwpuigb1rQYJ2Uf\nJedkdPo6NLgHr6GHEP37/4pRbdhVXxn14slSACaBSQc0wtokLmHvXGf17wLR\nIjwIOeioDMOr4sl2ZrQmRtpxqAI/pwPhf9LhdJOsWmdh/uqW9rW3yzPB4yW+\nf4TLQ1fE+5ztnheWCxAnlbD5xBO/6c5aDi3uqjQ010KJKKG7kaJfQO5ofhCs\nBEE6vZypGshGZOxHQM8OUrv0EykiybSvb4NkAOWeyrAlAODVFNlMXH0UT13I\nkMC7HPjeKUFSMI5ymafOT1lCsX2NGR1+OtgyktFp3fFkv6lzOWVgVwczfOpl\n72RoCfXWtBYPrqfeTWm8Gl4O5lErg/SsDqeD5hB7ZR+oCQpbqfL+4HkQ7cgv\nktwJuNHlzZnV4yj4Ds5a3AvqSCKGJ2ejUWR/XVZlUSxsI8yWTJVV9CkhD8ZY\nouCw/MIxOKGIh/PccwVDaNLvvhLfXZLrIRabCGQDg/FJIoAcMn6W1koor2d7\n+DK7\r\n=ER8a\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/extension","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","engines":{"vscode":"^1.5.0"},"scripts":{"watch":"gulp watch-extension:merge-conflict","compile":"gulp compile-extension:merge-conflict"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","dependencies":{"vscode-nls":"^4.0.0"},"_hasShrinkwrap":false,"readmeFilename":"README.md","devDependencies":{"@types/node":"^12.11.7"},"activationEvents":["*"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.d99bbafe17_1580257259134_0.9638174043800789","host":"s3://npm-registry-packages"}},"0.3.0-next.2ea221bdda":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.2ea221bdda","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.2ea221bdda","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"b360bf316cb238557b31953b7fd7537573ff8647","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.2ea221bdda.tgz","fileCount":12,"integrity":"sha512-vVa7LcoyQryRN/Jmj05zQzoKnqfI/Myy8IXNb10dHzbnOrg4XSyu/rDqbFSkAF5FZHCDYWQAhUapZiKv37Hp+A==","signatures":[{"sig":"MEYCIQD78YXnPeYNRbWMf+cnrvT4+/P4z/YL+uP9sQnYs9UgBwIhAPQRdlYHSZ9wiKx68R3af82CG2rVqSj/i6wxv1eICy0/","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":110473,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.4\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJeMiFdCRA9TVsSAnZWagAApdcQAIM/ztzg7fCr9DC/esfp\nQwF8Hd73ViKZBf92U5daY3njzAUDALyzCuswfavfyyumL4He49jphjZsRESL\n58qpCsaUZTy2C6Rb0ZzoSYRX4QsTRc2ViYpQvDfSD3ERWDjOiMZ8JDTmYl1M\nadn1Keve5gzWFK6hzbt0ydaFZ+LpN45wZ6zHjFTv2SGzyjKa/QP49C85DkTT\n/8n8l4Cczdhn7lM+H1Q47stV7ezoR7cLtTVySNy8miLhent0DfaxYoNanrAh\nbInIHieO+b2MYVhtl/avQXBm4+ac2soMG+XdC0cRbpXWSB+lcK+TnCxS4Ok2\ngZgy8Xiwga8etqP+BPUhprVTF3pL421zot9qFqL7HryKpQlFUHF11HrVG5z9\nDnq6q82vt3VkllcLQD8aazN2iBvgCGKgOBvMy3wAp0UiqQ64le+ViHdha5k0\n+f1zbtCMs80y+thBGYBfgCrAP5Ee2uj7T/GKUCkRtMtcqZnDMUY0CyWWQ+1B\neBNQ4GyXl+q0/CSYJ3xJTauVRERLaQncLH0vRShO7kXa1CJNCynU434H/3MS\noeqQBem/hxUwXRIfFlWcZ4aSweU3nCnV8lRPgJosp0iDXIK3EFM1ehMDIXSi\ncRqSpPZvc/nsHfNGOWm7T4f2k0AUS5WYR473Q75tO8SJVvG5rc4efHW7iL7L\nmdbP\r\n=EPAg\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/extension","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","engines":{"vscode":"^1.5.0"},"scripts":{"watch":"gulp watch-extension:merge-conflict","compile":"gulp compile-extension:merge-conflict"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","dependencies":{"vscode-nls":"^4.0.0"},"_hasShrinkwrap":false,"readmeFilename":"README.md","devDependencies":{"@types/node":"^12.11.7"},"activationEvents":["*"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.2ea221bdda_1580343645270_0.1903624618918407","host":"s3://npm-registry-packages"}},"0.3.0-next.845f5075f1":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.845f5075f1","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.845f5075f1","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"db3a33ae39e452e1a9424d025d959c1086e65ad5","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.845f5075f1.tgz","fileCount":12,"integrity":"sha512-Qqhx7aGBa1M//KzK5x6zy6TftSkcg4OOULDf1YsfepO8p9B/oI55W7qaYvNqH+Pse/mHurt+XJjucTyM5jrLjg==","signatures":[{"sig":"MEYCIQCGnNQApovqnyL70RJbpROs5tv8pjbzHO4Ua7834aNioAIhAOOB9ZBSfIlhMzUBPlJgeJZKtH6G3EB3T6YLmQByfoTt","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":110473,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.4\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJeM3LtCRA9TVsSAnZWagAAYwYP/Axm8R8AeffK7G/xNVjs\nX8ugRmh2l+eLlWJd9teNAJqDPBq7fENHBbWAS9djEyYZpPnLloEkcTnUDVyg\nAasiINpMxiwmFrJ1SHlKFOrKLXEAgGrhmlgSNBPMsDcEElrZkA2IIe6Zad4l\nQnDwAWl8TqGYo8rS/69qYBgvIkyQlDrw8+O4an3Liri0tqigL/fAfQWXXG/e\nROGZubJjbWFPqweNIDETXeRCDgBgZBGX8r40O5iglBNeGSlU1gn5Ree2OnEc\n1HQjkVVVKL2GJaqIVsJLn37RVI3C6UyJnYW1O03DqyApl74hMV/JzuO0MLTJ\nTYdQJ3WoTSZ2JZh8z2FQ1/momKzKTH37XCldPjKP8JBB4e/Cgud8Kre8phsb\n8pTNxZWsVR4iWTwiHNEqAjokSoyZQl3Z3quIdlQ5cwgwURytuifwHpbxi8FA\n2aQIEOYUdNc2zHei9O77Y/2VdE3+xkT5cJXPue/c0gI9APqKz3NWhXngTDBy\nBCpg2n+DvHFQeNnV8TVQZnzOJM5uggelKYR56irHkVAZGegvOFVPhmXNi1Tp\nEN6r6kInYHJJxKIOt5BUYNIad4GgNGdWxHlQW1yI0ZPyWrSlNxIhJoa9sD64\nbcb0R1Zhj///Yzq56Tx05AySYIgDhe+6cEZX7wIFlyBf+EpoU7vPai5lm91O\n5DGt\r\n=tpiK\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/extension","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","engines":{"vscode":"^1.5.0"},"scripts":{"watch":"gulp watch-extension:merge-conflict","compile":"gulp compile-extension:merge-conflict"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","dependencies":{"vscode-nls":"^4.0.0"},"_hasShrinkwrap":false,"readmeFilename":"README.md","devDependencies":{"@types/node":"^12.11.7"},"activationEvents":["*"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.845f5075f1_1580430061478_0.29909082121759045","host":"s3://npm-registry-packages"}},"0.3.0-next.f4786e227c":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.f4786e227c","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.f4786e227c","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"97bb3a5089d64e5cdadeb01f7a37a9d01c0ca7bd","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.f4786e227c.tgz","fileCount":12,"integrity":"sha512-QYBZFy24+6xqtcRhJYijFGmzhiWBGSS6u1xHJyNIx2UkgVCnPsrBiwFadBx+3D2Mewbka+FOzNfEsKUOv3d1Xg==","signatures":[{"sig":"MEUCIQClFLJ0j0kXBt360iM8wMMSYAewqpBvssjDd1x1/VcwtQIgUKfTnfR3FuR2xxsFM45ftUZnrx60am/ATjcGQMfCVsM=","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":110473,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.4\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJeNMRPCRA9TVsSAnZWagAAmekP+QCuA2sXQEE1ESdjK5Tx\nIXXUmumehSUCXDKmDD4z1+24RqyJXYESYhphp5fl+w0WMxFjBCPucmJWZVQw\nhFKcKOZezD632HjbiSkQki121+nkGj93J4fxmCPowRL1jkUxtDxgJiGhdwnJ\nv3tBzyJ7rThZ0fh/vvGRbxiGsZzv/1XiGuJiqiaIaCLFU1g/E3D2NEdasF5T\nHnWcDzJLxEO6TuLOaXkKKNlvVuTCeSNQZT3dlUOd9nElEO4vwdlYbWKijrM5\n8XcvOl0PMki5ylLIZEL5StTHFIBC21BSuyQcjfo+xEMNRGGkNd/cM/vmeUNr\nr4OfK9jX4KPhJUfB5clY/mX8OHL3iKPdQI7+sIKPvYJhd+qUA0/iBM+tc9ry\nrVyWDBV6lkZSogWGlsfgdT9zHRtLfZLJFTz/2o46Fv0xPuqtkzLg/fnm/P0w\nl4aVRugmdVthRqhe2Rqw1+4yMBvCmeE8zvgPFDEKkslxqnJ3aWfR2ER4Qdqo\nVYmhFYRXj/To/X9/luwAx1+ARxQkhFCsRHDZ8NK7yIH2QaqeVntb95WCEpOr\n30KgwiJRKC1DPw7/5D+VXr8nV8FMPrSy/dHpRdb5/EsT14ztesrwjg8sWoxy\nYO+r8pPTATprYVC6nWhczAzpxsMiiPFgz03mBExz2ScZmOy34FCVIMl5u7Uf\nhxkG\r\n=ogT0\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/extension","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","engines":{"vscode":"^1.5.0"},"scripts":{"watch":"gulp watch-extension:merge-conflict","compile":"gulp compile-extension:merge-conflict"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","dependencies":{"vscode-nls":"^4.0.0"},"_hasShrinkwrap":false,"readmeFilename":"README.md","devDependencies":{"@types/node":"^12.11.7"},"activationEvents":["*"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.f4786e227c_1580516431050_0.18318248285447924","host":"s3://npm-registry-packages"}},"0.3.0-next.c4309702c5":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.c4309702c5","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.c4309702c5","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"d47dc98dab2abd17f679395067d2cfbad18d3e1f","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.c4309702c5.tgz","fileCount":12,"integrity":"sha512-cIFv66LP/OfS/3NuwTwiOr/cwHAjDVCuDE3leh328l1G4Ew7VmmODJzfKVYxtNcbw4yZtOrhBJ9IQShLoDRE6g==","signatures":[{"sig":"MEUCIQCP7j24xmKxwK/wrNGBlQysLE590rNHMWCWBVCYi7kyIgIgKRACeBqQPQVEZenuehYaK1kOB/s1ys3q23Galdj+cE4=","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":110473,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.4\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJeNhWSCRA9TVsSAnZWagAAWFsQAIH1orFBkJQRzc4g2G+8\npX3H6n40mJDjNBX3AMs7k0lWIPX2QseNgh8PH5VFypW+lpBVR9AJffBiSC9E\npc6ljEfUPtaFMW9zApe0jlwmJg7PhXcWNsFeu46TiKtUYzsSgG1wDM1cf9p7\nvdbxlGGFc4gKWmCaN2DZCI6lbRfob+BTfwQgcPwx+PjMA3+rzIHb19BNDmzW\nkmLCourdz00ju+S66WP3RhhG2R2680dyYbzu8Zy7CwnS9Qd86Fzy3Vqs2Ig0\nsNy51e0I2e1UbdRgV/IoOIisaAe0RL0mYectMQIGN+/Zo9Yk4NZnnKu4S2mW\n1RnQl3UBgWk9RfJU1naWOl6cuwJTallsITB5FoU89rWTdja7EATgrWZ+kGdB\n/hzzYvMZ86IbuQ5Oarlr0UmhM7u5af9D0vv6Uw5csuxPPvvHroFrNX6gGfWd\n7r0dEOqVi0se0POTbOmNiX0SJPmTxfDPVowci8EAQv92qHqJH0NSdhoXiBFO\nl/x84nEX7ueImZ38EnVTKt6qadPqBw2Fe1T3z32LgFuDVN/PlQOYCfFHDG4n\nKKiPoS8Ql46rGO7pHyQYCAhYHypi7DY2kegWrSwgeBI8AXETOWv/I3MeoRB8\naQnTS4LMsu48/g2x7MdQoEGfi+We2WSRM0N3V7AV5qrfRWax1tjH7uguj908\nkZwo\r\n=c4qJ\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/extension","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","engines":{"vscode":"^1.5.0"},"scripts":{"watch":"gulp watch-extension:merge-conflict","compile":"gulp compile-extension:merge-conflict"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","dependencies":{"vscode-nls":"^4.0.0"},"_hasShrinkwrap":false,"readmeFilename":"README.md","devDependencies":{"@types/node":"^12.11.7"},"activationEvents":["*"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.c4309702c5_1580602770496_0.2814337577151482","host":"s3://npm-registry-packages"}},"0.3.0-next.50a7443ae8":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.50a7443ae8","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.50a7443ae8","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"9326e0c2d87af4bf572afdf894a51b307f6a4251","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.50a7443ae8.tgz","fileCount":12,"integrity":"sha512-yNstPLpLf1Cj4k9jaAonlgbwp42yz13BQ8xDHgtXjJvT7UimuwrDft1udcJIUH6w40sC6yhn8e8+Iusm2ZaSpg==","signatures":[{"sig":"MEUCIAWMpGg5lN2GkPxER/zfEsVVLw7oBZt9ouy8/TBvb+c/AiEA70unW2KJrUgTyn+hdp9NJ1eAHAYQEKeiE8ZsAlXsRj0=","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":110473,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.4\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJeN2c4CRA9TVsSAnZWagAAXLEP/iujWdy0qMes6pof2iGT\nxOUlu21tC2UOB1+LpawBpkbShisEo7pfejD2u0+IP0imxfydJZ3TI2cmGOlG\nPtxBRyBNuoLdctbEKzIpFPV1U+2uAITh6Ag6yHgx6dXOmOVFcR8t154whX9j\nouct3958C42tiye+7v0kQSGGhgb8zMBcE2CmfrvbD4Z/U7kUsHIGxOLBfxCN\nqqsiZcKQrxkaZ0MglvHOV2v6N3UcB0ATRPYwmkyt+jCh25HveizRgnpt9vGQ\ncgNE706O1ZnIB3uP9x3mdb7FYRU2LLBHbCNWSvZo3frem8NmtOiGVhwxnZKR\njKTbmZVkUI/xgjyJZd7NcWMG3B4kPmiZXYrJ+JH7+QESQMmhSydqvEQcyFjc\nPhCA+c+3n+63QKmLpQL2Qv2b4jUcM2GO7mZWz93UsH7qEOSCqkF+anpu08Qo\nYvx3KjVrnWYX+Ax+k12hzNN9lgsgZBBH/055zJJlknajgNmO5ZKPNueSC+q7\n536j1RiDSakeRqRjmu/HmwKQcpUk3EWviAUQ1K2q0X3+kQe3iUN9D5zkMC9O\n4ySAlPQZAllnljCb7FzkPCcmWNWnNarvEbOOL1pvhKdJ+DGKrWa8qNA5x3Vi\n5o4biTpaOcBTY5I3W/Zu97JTSoQ2XrMnssnaCTVXNgcy4n+gEwWZM8VFZyKG\nMj80\r\n=yLya\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/extension","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","engines":{"vscode":"^1.5.0"},"scripts":{"watch":"gulp watch-extension:merge-conflict","compile":"gulp compile-extension:merge-conflict"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","dependencies":{"vscode-nls":"^4.0.0"},"_hasShrinkwrap":false,"readmeFilename":"README.md","devDependencies":{"@types/node":"^12.11.7"},"activationEvents":["*"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.50a7443ae8_1580689207661_0.35809636408873513","host":"s3://npm-registry-packages"}},"0.3.0-next.c52bfa8906":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.c52bfa8906","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.c52bfa8906","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"fdb7c4946d9e9ad8a163291d3a62bd78030470b3","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.c52bfa8906.tgz","fileCount":12,"integrity":"sha512-H6oQ6+Bd6HQ3PeDRR9TYIcrFe82szz1McQ0DjzhOMgEIOmai2GJfSW1yPHWhzrV+eZsk2YPD/poo6iOxCMUrDw==","signatures":[{"sig":"MEUCIQCVid8q4aAkzcjM3Yu5XJ5AlSIDdNOkoVlRjRLbI5knAgIgOy5Kif+he+dTNHM5HztpM9osEF44fv1vnuqRZ3+3u20=","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":110473,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.4\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJeOLj9CRA9TVsSAnZWagAA5H0P/3d+DKXDJZO2cIoxKAwW\n0S8uoinEgaEIePYlH7AhUeMjQwVR63Cp+Fd4TMbI95sHNRq4GDvSy9g7olbZ\nLFR9RTuQn9jNsYyeUUqY20Tkkv3n7fA6bOdOQzciNDDMUUof2pf4dPV8lG8n\nq23H8k/VVTzZiSqGew+FX8LyyRSbiagEYy3pdD4jZnoipj33DtgRI5KOyfno\nPUrcDpg0ep+qJjL8Zn+/d+FiQMzYno22u04bAsiTyNENu1EqJG0KCCT/3Oic\nEMnl/Hq8DUv1/C1Vt5MYJE869OfxiyZlXLkWsWuTksZXkMLZ0joAXks5obL4\neEP+64nNXCuBydC40mcALAK3a2OjtMDVlyVYuWDF01TwRpC29FIGrjQuHP5l\nb8QeShtW0zOQblC1VYIj995c2AxAmJy+r1/IuuwWdif9aJBvLfnCJQwEQvYf\neHG/7VywzOY10U53fqnqyacp38I0azIlkDmrq+LAQOfYgCxpzqxjLBMa2Pts\ncW3TzVoEqbjS9uWnAjtNV/0IPDV68B9fxf7YXO81aNNlw9iQSKAYG6JXOtNp\nz4L/dB4qlPJ57GFMssa94KCohrFvRYElDJT5TvgbuHwc0NQw0JejPfvrzADi\ndwmUhg10cX/+bKlxLULeq49jqTTC1mnlis+hke3qwMJvMSwcLzyfU7mYHiZN\njLBq\r\n=Vtf/\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/extension","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","engines":{"vscode":"^1.5.0"},"scripts":{"watch":"gulp watch-extension:merge-conflict","compile":"gulp compile-extension:merge-conflict"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","dependencies":{"vscode-nls":"^4.0.0"},"_hasShrinkwrap":false,"readmeFilename":"README.md","devDependencies":{"@types/node":"^12.11.7"},"activationEvents":["*"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.c52bfa8906_1580775676803_0.024047268918090614","host":"s3://npm-registry-packages"}},"0.3.0-next.967aab8156":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.967aab8156","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.967aab8156","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"744e746bd80ac647e321ad6918a80a21eaa92aaa","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.967aab8156.tgz","fileCount":12,"integrity":"sha512-EiVjFRCDvjuHCk3XmLks8oCI4wF2BcfL3JPohFBFJepYcdmohDaIBnV5bbvMPYMm8ZBUsnDGcGToyCoI8tue/A==","signatures":[{"sig":"MEUCIQD9fwvke13nYOs2SHL4rWsvsvyYh6YioN0TOUJVLxGtzAIgNes71H3RYQ/PYcx7ADjdxKBUxYpBrsv1mF3b3J62aao=","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":110473,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.4\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJeOgw/CRA9TVsSAnZWagAArnoP/1oYUoE1ZkzkaBLMpKss\n7VIgdf8zLEFy4qfjSuP0rDeuoYgr6a6XymOayt8yF51qrPCYQ6XCqxzM+S7Q\nOrSBBnHIoHnWVcmAAbPBMPipTf7qQuSI2Vzckj5+hvqwbDvu/KIBuhwgkkgN\noTKLHb+7rAAm/bOOiNqZE4dk4a4xI+YSBCc0q2xtX5wVIl6SeNv45pZtFURt\nSTBYITSxziioAMyo4zmKj8q/PgeJstzp8hztzCxvrFczG72baF3EK1Qt+IGR\n377MrIgX7xCC8K/lAB5eGJwD7+8XkinpsTnjjuXdzxdpZ4m3OIvb5ro51lNQ\nHr0SEt0aiw9EOkckZinie4CtT4WZ+Up5dAKjhsk5wDS9pdEK9Kvmpk+BGowq\nYWBLy7qk56yEAPkn074vajk3VF400x6Tub4Bdf/s1jfKCrCndSpzEOLqwPfC\nfQhClFLXspZFxdH5wKWC6NmYZSM0FqhVSiw/DPpnT8pDBcGIoFf99fVZDs/Z\n0hsY2RjXUWXALvwdxY/vnyLW/KIg2JHLDN0HNJZAh5SmFI2AW+5iTK5VfqiK\n4VdzX8fDdjoZlfQ2b9PE85F1HTi7fUS95+6K+k4zaUw2keNNP6kKM6Xj0SNa\nNrn+1lo/8TcsoLyO0/ro0zNdmb1IYCI0ekz+vpGIdpSY5NIkvjfb/W5IsvoM\nwHWJ\r\n=K+2D\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/extension","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","engines":{"vscode":"^1.5.0"},"scripts":{"watch":"gulp watch-extension:merge-conflict","compile":"gulp compile-extension:merge-conflict"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","dependencies":{"vscode-nls":"^4.0.0"},"_hasShrinkwrap":false,"readmeFilename":"README.md","devDependencies":{"@types/node":"^12.11.7"},"activationEvents":["*"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.967aab8156_1580862526782_0.38073926367276134","host":"s3://npm-registry-packages"}},"0.3.0-next.9f21f67bea":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.9f21f67bea","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.9f21f67bea","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"caf17800c3424936837608fd258a6a71b3e23fe7","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.9f21f67bea.tgz","fileCount":12,"integrity":"sha512-qaQeUFoC7TWaYsR/J+zofJ2sOX0+OLLsSAKX7uFcZhS9rESuapxHWY9+yGedieHR8MYkTsPuXOoLGfKpIE+ByQ==","signatures":[{"sig":"MEQCIAMm1vks3rub3/yWcLNHll4SbuID9BkG91kS79X0oo4PAiAEHdez/SC4+GnjvKsGTl1XlxJuM6SAEZaiielkFwyb7A==","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":110473,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.4\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJeO1wwCRA9TVsSAnZWagAAI+YP+QG5vjOrLPJw1iXKB7z/\ntH67elfrCxUScmNFFkc2FYucrT+tnNRn9HURoFhF60x4ir/dfxED98gb71Hx\nfwg5GlRE+3uRKfj9tgc0Hls5cjxOP35TtKE4ZDYK0hW6blMGfURdN+Ggc6sq\n4F6D0CqEpylJ6UJHTsa7Wla5BMindHj8TDgVtNMjLj5SDSy/p8KdeTbCr4cN\nVizHkPEizoaVkNYrsAYJvJF1C+/MfPty+AbLTEvGV5ZPvyHwuvsHChG/ZsGD\npNSPZJQUmLXa87hDj1S4nQ2W6A2Yx6mhdclUPc5QBg1wHpuzbrF1tV5R7L6M\n5Su+cOSbw3tDTyg+VRQ3OQMu4+TzLjxFWFik/X87OEzmzSelAVblS5e1LvrU\ndVtZu/6m8nrQ+j5s9Q9a8jOg08Xyytbrqsp/RxoZLwydsZDqNAxFzfFkpJSs\nOuKeD6Kb5WRVggHzYuVC5aH2Tt4nWne5VFTaAILaQYM2Db9RKsgsIji3aCyy\n28PrCS8K/h9cmExiUWhtaJKNl90qhoru/zzh+mNr3+yQhfBCWR/xbEi7Tykf\nSvRz5bSuTHV+5ho0GlliBxT6U2Tn3tDwoR8aUbFoihdgJ6U4VnGcKURRRcxU\nbmUfKomb4RwGAKTQPCtx43Jqr1MslgxUOhBwOxJTK8b4x6sLvXCv9eYXz1SG\nyQ9l\r\n=JyDj\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/extension","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","engines":{"vscode":"^1.5.0"},"scripts":{"watch":"gulp watch-extension:merge-conflict","compile":"gulp compile-extension:merge-conflict"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","dependencies":{"vscode-nls":"^4.0.0"},"_hasShrinkwrap":false,"readmeFilename":"README.md","devDependencies":{"@types/node":"^12.11.7"},"activationEvents":["*"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.9f21f67bea_1580948527902_0.08892413114952502","host":"s3://npm-registry-packages"}},"0.3.0-next.7cb5172397":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.7cb5172397","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.7cb5172397","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"a51ee06d3ed61bf11e55128e2c9e8d510408533e","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.7cb5172397.tgz","fileCount":12,"integrity":"sha512-dFz68ADOcRnQ0GjLFfYdyicOm553jmWJqE+jdwHeIbG7a9Ul6Kh7xIde/ZNjTDAL6Rt4yt3lO4hBlB5qfCkIZQ==","signatures":[{"sig":"MEYCIQCyviNq7SSL9QxERC2uT2lsp+VXK2HszJZyrU/4OpmzXwIhANmLmui2TLFwE96Vk7uJldEdZF2xtmDzzbpFkdjZ5ufv","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":110473,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.4\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJePK2YCRA9TVsSAnZWagAAWTMP/2cxikdtYFyOW+DIh5pr\naaaye6KkUK8rYfhChJWbu8a/1xZkzEagmqqSEYLpDQxDU8qwsvgLsSrreATf\n2CsRCcgDdno6mQ5l3qOxktjMxsnWHbglunp5MTekwccPmmRqw3va1UHTJO+c\nlO9GRq50JNfz9tom6x2pgHvijK6ffdFkbtwyU5kWE6NTjFl5+1OGI/S56FKd\nKvQkXx48qQu05rwhc8xrxkH/G83EU+XXmv0FdmpdqVBXcLr5kbNQkujR25Kb\n6r7AV42h6Rqh+1GVFej6drpifgaA5jmSclHkwqe/UiY+gXb0UZ/VxXntb9aU\nWuNcOFB1vbx0c7Wi4Kneu+htOeKxrPHiakvT/oBW7E7qgsDpaiUDQqDDa6th\ngPGwHQ0k9N8QDU4oOzUeosuy/VKj9NmDrZVipqsmFJJvbhiSQ/kOhjq/wogU\ng2ccnUjw76D52+Anlm0H0IBNJPy/DjcmwTV5KmawAEnQbRB2/tZYoQullzsc\nZZtTWu0m3mp9UwiZ6r+Q0q7wa/MjLS6CJZlGPhMp8kH+jSKyvOdweodeVtEz\nAtdR6wNw414XvM5CABOi/GKXmP0FBLXB+JKlmjmQz1DLsDibd6QOmXPhfxBb\nOt47U1pc9nfsdRPRuV0UFrIn51HdV6IgCY9z4DqdO1jHvObCNHVyhYmMdjIK\nlOYv\r\n=4+nO\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/extension","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","engines":{"vscode":"^1.5.0"},"scripts":{"watch":"gulp watch-extension:merge-conflict","compile":"gulp compile-extension:merge-conflict"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","dependencies":{"vscode-nls":"^4.0.0"},"_hasShrinkwrap":false,"readmeFilename":"README.md","devDependencies":{"@types/node":"^12.11.7"},"activationEvents":["*"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.7cb5172397_1581034904551_0.44567601940805135","host":"s3://npm-registry-packages"}},"0.3.0-next.b46d35c25c":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.b46d35c25c","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.b46d35c25c","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"53bba71be7c92f390cb7f37f8dc2552c23dd2f39","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.b46d35c25c.tgz","fileCount":12,"integrity":"sha512-JxlPUoxk2PO1LZg5weXL9v+DVXkDWSMzjev8CMypFTv7K+JorZ7P1wbngAeJlnCjIGT2qHOfAITLR+Bp7efWUg==","signatures":[{"sig":"MEQCIFopXaumbXORyo0PQImZ6fn+8amOsfsq/OTS+WjD+xClAiBrbZbdbv1o73J+9tAnd6HehRTsWPTIqiW51j7uJJse1g==","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":110473,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.4\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJePf9LCRA9TVsSAnZWagAAoy0P/1C6wEnJQaXoCJsxR+nl\nfBM+DsqvlvpjIGNX3Ws6yBkZXvS1ZfAd7LQh/dRpjggc7RXQTNJN6XWn6pUA\no7bS0My89uevWXJKyUgvHUfCKXCh9nVnLKXW1vQMBcLh0eTlBBEvhyLzPSUL\nfTvC1k+9VFw3u80X/Wq0g1uEVlw9NA7vHbBl6kAza+8sCcRsBTyr9J1x48E8\nn27TqrEJpuaA+15w8NUM+wFWG2RPute/O7lbVG17UUnu0vHv6giQn4y6FtZl\nGX8LI35T4mKA9jp06dGKLqsQXaO5OZI26i1sv71cm3iRCT+2VMp4XkkQA9VA\nAkOX7vutpFm8YtuGQKlO+gJFvvF4yg/SC5BIjIzlXYomOY62JPN4EIB338nu\n2jD9Nk7bAM8DzMBcKMBhbK9vzokpGh8PgpXhCEKyTNNMPFspchDy/6aYwe78\nP09umhU0G3vxLtxOFAbHoBe8+mdfWLkbWemMVj1V4hCanPhcxLqU5qxM2Qvw\nPhFgvT8Dd7lzFZ/gLCHxeS5hroOBut8FmpeISoowWoJ25MphySiXkyPGazql\nqYqLpg5vyEHgpHkMHRSFhvh8C294759zpk8rTSXmRR4TPWVqXHhoTU+G4l8m\ngE2R1QHJMj1E+Tpnin/5zeRF6aOXAAKpMR/2JzkrDTVQo6y7aHQwbwH1lkIa\nswmv\r\n=BqB5\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/extension","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","engines":{"vscode":"^1.5.0"},"scripts":{"watch":"gulp watch-extension:merge-conflict","compile":"gulp compile-extension:merge-conflict"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","dependencies":{"vscode-nls":"^4.0.0"},"_hasShrinkwrap":false,"readmeFilename":"README.md","devDependencies":{"@types/node":"^12.11.7"},"activationEvents":["*"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.b46d35c25c_1581121354983_0.9983993528192932","host":"s3://npm-registry-packages"}},"0.3.0-next.718331d6f3":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.718331d6f3","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.718331d6f3","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"15f2b38f46ce34cb28215fc2972f15199bb0a582","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.718331d6f3.tgz","fileCount":12,"integrity":"sha512-shaMzPxFkNrN50SUdp+smEBRdWAF/7Knmzec9Wd1GZaGxgAO+Vfq0j5WIXzIh5uy8Awl293+6IJ8yvZw0bATHQ==","signatures":[{"sig":"MEUCICZBtlePXgtpCOeKZthK8/KIttbS+p5fQY5n5T68TTjrAiEA+RGFlgMfZ/rYZtRIf1ZxuY1Mk1DQIAmPXtYSowQC0pg=","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":110473,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.4\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJeP1GPCRA9TVsSAnZWagAA2+sQAIFrP5+M9KX071iXzOu0\nGJXnPR5eOLJCHnEerGjumfWTlRjg9gZ6aVrLFBmiigK2W3V9SRztrebLz1c4\nLCYSfE+++u0FZ72y8R4ZgZHWO6ck0ja2OkcwyLtFG1xyM7i+E/GuFup95SeF\nzym4FpV4tFrtxE4cCZl2J/HP++K4Socnqfolr76mDqjvVypgYOk+x2Srouow\ntXl3Qc4dzkzZNkYEWn6MHpBfVNJjYAJ+AHXsRmw6SZldy4jfDJ7oK07xHS7G\nZM5tZ7Y9B0I/jR18QBH+1NUzhuIGKkNE1h8NA9pjz20jTw61ShWEv6WFstU9\nJz4L8L7A5+WJnMlUwlQwWcfxk0R5Jj7PneOvDUzpCovv92l6fE/a6d4ak8ey\nVcmVOpiIRmU0ZK6X0H1SuXeCE7ehBZ0Ab4lKflJex10K3iTgBCQ4Gx7XpJQx\nZX8a+mVnfEfoL8QieISKeGAVMnehjg2R4PIZN6HwpQf54svaBxYsKldUhCsy\nV9m3iwMj3MiHR+N38ff58owHFrEOrVyUjc4Jdy1l2G67lApzFGUYdsgR7p+0\nqecDmSZaMrb39qZSTLoMeHcWJVpmWMyQFZC3eEA7SH73ODDvyAIH7OkH9Xt5\ncAE4W24yjulFIlCssmVLmcq8hQB2scCyY1PnO82m5Y6kfscRfjPdWM0EDRw8\nq89y\r\n=1SUc\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/extension","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","engines":{"vscode":"^1.5.0"},"scripts":{"watch":"gulp watch-extension:merge-conflict","compile":"gulp compile-extension:merge-conflict"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","dependencies":{"vscode-nls":"^4.0.0"},"_hasShrinkwrap":false,"readmeFilename":"README.md","devDependencies":{"@types/node":"^12.11.7"},"activationEvents":["*"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.718331d6f3_1581207951465_0.2071161202883922","host":"s3://npm-registry-packages"}},"0.3.0-next.46750df406":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.46750df406","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.46750df406","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"4c5c62f63ddd653202e663e5ceb14b04a72292bc","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.46750df406.tgz","fileCount":12,"integrity":"sha512-vaOMyT8bxxWuFH3y2LLnxTNKtIOHhuRkMN+y3ylENiu24nLW3Bg3z0MzYCFALYqxs4ulpX8NiM02VWnbdLbNOg==","signatures":[{"sig":"MEUCICcwHDefUq6H8YTB0tbW9mq5xg3vKw8/AFaXuET9qoWFAiEAjBmbWeZ1Ctj7e8hiRTdDQJ9y4IDWD57i9aOitEmGrlg=","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":110473,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.4\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJeQKLzCRA9TVsSAnZWagAAArkP/22wCO7xzZ/uPaw1wDxC\nRTVH0+soAqDubxA4oox5DOeZgLZjm/E95APRRpZscXFYzMhhUhjMmkXiXE0I\naoUwswdOqlbZEcLK0Ev0H+r9A+cPLct73vFkQI2HorirYWQRz27IiDKqnq4C\nAjZHR46EwpHYb55fg/EL4tYWQjIXx503/y4DDRrmMCN/EZ7BIfH4jWrTGsk2\nckKAZ2eEjcVExKu6ThwfA/+MnpH0ZPuAeiHVGCYhwSy8ogCjYWgQZAENHAId\nfcPy4aobb4mmbbdYEVI/AtVo5/J2WNOcilUJzetkha1ZT33M4E8rREdaFijY\nD5fAdW/4Ba6ZyGhAvtNuce25KT+7zEZbEwf9nhUd+/yx6cJ30qiy/bB43zn1\nU0y89xBYGqrnsZvnJQkuO8XuN2et2W9ze0lrSoqYii+ATJexDNQQgLmDuKAe\nJTBnMbfH7eYLIrXHK8BTcpBzeN2YrdUc+jEvO1ye8CUKFq0wijsdy07r20R/\npXFwCUsBqQXKQAFqrj4YdyFp28TOTB2WQOy6gOfsHWGFcu3llH8m+qmxO1+l\nQInrGLiTesc8LbcmeCXeiCQ1/+4XmKS4qrZZ8Vb/CHgvhj/cSZfifmSalQ32\nAckPed7M4zYhXbk6WmIbFGf6vE9uSbRFHcAcygfIHHFUKYucPsreMCl0j5Vw\njvBW\r\n=0qpb\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/extension","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","engines":{"vscode":"^1.5.0"},"scripts":{"watch":"gulp watch-extension:merge-conflict","compile":"gulp compile-extension:merge-conflict"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","dependencies":{"vscode-nls":"^4.0.0"},"_hasShrinkwrap":false,"readmeFilename":"README.md","devDependencies":{"@types/node":"^12.11.7"},"activationEvents":["*"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.46750df406_1581294322574_0.4613557017822818","host":"s3://npm-registry-packages"}},"0.3.0-next.fc9cc2c397":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.fc9cc2c397","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.fc9cc2c397","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"2c505545d9b961254cea1c939ace65a331657766","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.fc9cc2c397.tgz","fileCount":12,"integrity":"sha512-5Sg27cGERSx5sWHw+INHuxYlf0GOzDRaMlNPESdUGIAR3gH5utNhOmVaFBNWT02WZN1SuXc2mG3K6ScGfpyoTA==","signatures":[{"sig":"MEUCIQC4kJJss/ZjVdqRmOEalsAxfvIC2u0vtLW92S7Rbc7ttwIgMzpy3HRoRjTfrJTYn9lWkU2QzcaBGQZeHMjCZkdehh8=","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":110473,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.4\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJeQfSSCRA9TVsSAnZWagAAc/IQAJqJw05JKpA2ySyk+ybd\nCReAQD3Y1J4zPHxI1L8e+wNbgMYTQsiZk5KwZ9RbKDU2CEMv5H00SAvoU6eM\nlazX5FTpmGuVtCj4uyJkMt6BsKe1NzjEpoCQToXvfcflwa7u/e7XAXPaULeE\nIlGEztlh/xw9De9zVsQThsLDbofrdujcbm7SLc48pu4VAbMEbPUUvFWQSLhb\nmse3aoBUA+zy93afwLir5bRIby9pDLI4fnFpidA/w3BMpUdR/vjcZ8EqMtkX\njMx1GHMPj0PZ6rrkxvmFa127AP3QUS5YnDqk4ZzcvkunZUsWkpKS5DaVFpjp\n6KgI4RkcyouLn2T1bKj8f5Y3Rdi1JtqzEddlu/MuFeyGxlqajHTo6AwU/EHj\nY3VSwMMUZx5vzRoW49wFBHn5YM6IlnbpWfgYQGFGM47fuP+/4W1xPAQ8fAtf\nosAGGNtsSgzfhvZDuv7pk2PQbeXeovP+7JRHxM+/Dc1Dd8xBeYCRnMbyb+pq\ncgUlpooNxkFd2BvC9as9CzIdZ/kDFFGPLlLPu10qqtoxlPiD/ff8nhoi4V6g\n6h+zQmHYeyJb2OPfWvagYkV+m5e56ipJQAtxlcVpT4KKjE7f17KYQ2ZuQ2b4\nvV8RpL2R5evq5u2luVnG/CpwV1fRvQ2CDWSulHdWsU/gpi3H7iPkvEbOa+Tz\nf33n\r\n=aaJB\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/extension","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","engines":{"vscode":"^1.5.0"},"scripts":{"watch":"gulp watch-extension:merge-conflict","compile":"gulp compile-extension:merge-conflict"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","dependencies":{"vscode-nls":"^4.0.0"},"_hasShrinkwrap":false,"readmeFilename":"README.md","devDependencies":{"@types/node":"^12.11.7"},"activationEvents":["*"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.fc9cc2c397_1581380754528_0.5297106371859841","host":"s3://npm-registry-packages"}},"0.3.0-next.d5aaab5603":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.d5aaab5603","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.d5aaab5603","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"0df951b96f83644f30f7c435560a980715bcd588","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.d5aaab5603.tgz","fileCount":12,"integrity":"sha512-VbnGVdPuIlJJ+G9GJsddPZXxhEiHZVS9w4QDRwHMK9jgWUQ37+9NXaoBKwhCfzxpQINmg6q7qvclmxjFuVZDYQ==","signatures":[{"sig":"MEUCIQCNWuSkYwz9p8putT5Grx4g8nbVEKeSp0+zbFKQApsrIQIgFLe5/zpGDBV7P58MwIdx+Yv7goaiVy0KSrt33Qlv5HQ=","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":110473,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.4\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJeQ0YYCRA9TVsSAnZWagAAFogP/jXu6MtG9IBfy0QADO/7\nm5pXEHlJjdiU60CDhyK2IPrmaZ8oNKoHjU0FEll0A0VjVIs9KE/IaorUAyIm\nVmcTV1Fj4hTL5R45zqrgNl4Xhw9DNtYGlySC2ndXsfHNBGK44iYG1FLQIbMk\nRzIZaVkzMAn/p5YO7djfQZWZGJKGwJY49gqTSt7uzLJlHF1+AwIGPRxLn6AT\ntglRYMrmM8R8J+cpuBwZrCXrBuG8lNUz4ZZkVvBplWyHy9UvZpwRVsm5r4li\necR97f9BpFBAhw/J/ID1OuxixY9ip98FaiNXTW6Myg/4vamEJpeXbPg0Oyxl\nC9/Xixy+2qh9uFJRobJWlQns0L3Wd0eWQHi1QZSfmKdiYlADKWqP5emGQRhH\nhsSwUKBvaDg3vnqFCdb0UyH3sGUMhg1E8D22iPUlVTczKFUZIIZjQBz4SJgz\nmpeQClIwZd40pmxlz4a/+JPS8FRUfbYSmnyEt1r9IMtmzCY0o3cWDVZk6khI\nFMLVt1d1vb28dJtfWBdq0sIDhGZ/M33n3tIY/m4ghESluxxxuuiXOQzRWcQ0\nGpJQsF+t39kCXd4lPXQGwl9OoyWYH4nCdgdxW2D1j51Y5oW9jWAypcoq2ds4\n3eP5Fu2UR+Xq8Rw3H7GVpDirzTsBFYIyC9G0Eh49RHYeFQ8T+cIV8ZrzG7ve\nRlxy\r\n=GMVq\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/extension","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","engines":{"vscode":"^1.5.0"},"scripts":{"watch":"gulp watch-extension:merge-conflict","compile":"gulp compile-extension:merge-conflict"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","dependencies":{"vscode-nls":"^4.0.0"},"_hasShrinkwrap":false,"readmeFilename":"README.md","devDependencies":{"@types/node":"^12.11.7"},"activationEvents":["*"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.d5aaab5603_1581467160251_0.00839016114502944","host":"s3://npm-registry-packages"}},"0.3.0-next.e4c77cdd6e":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.e4c77cdd6e","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.e4c77cdd6e","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"337c97de23298eeeac978ab114b7abccf9a346f1","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.e4c77cdd6e.tgz","fileCount":12,"integrity":"sha512-v7oDIkKEr+tbUHh1IneeKkmVxM0giEDY+4F/7+qlRlo2hAlYpNBWrDcTgczjcrGMMgJ0ZwyIadaYtC5oOe60Xw==","signatures":[{"sig":"MEUCIQCrMaxBqPkpkJvyCIFt6+yP8qD9ghlpNFHtH5PYFHgwSAIgS9BpslldAa21mod+khaVhT3tiUiJnsmuigWGia/8TY0=","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":110473,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.4\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJeRJexCRA9TVsSAnZWagAAWncP/jeb4bWwQJA2JEp9OMkm\n1WwZ96XkC0+H2KEtedKpAmjsfXSZzSrThovRMe5hUK/dfMSWNDLFf0B8auil\nQjQuirMstMrdrSbKI78+0wB6dlfh43ckM4EDmeWBhRPmkWuACG65/76l2wh8\nBI43rlwH4T+1Mk5h0Qma2ImHQMnnPdep32VW7N7eKMCC2iciwzbyf86G2oEr\nKeKxyA5UeNhuLGdt9PNoa+S4JhXWMPIJrcDrobSbg98zCMWk1QdiC3bWy/HQ\nvHzh5oNyffrWSfnRfGoCdUqmY3JXxM3tzwfdtPisaknCTeCcXvVrZG1GUSPn\n5Y/tISqx1dZ4EWqwwYvMmK7d0d84S1C1Ceb3F/TuqlhJ6gWJ6J7g2xhJSy4d\n4EqwYhuQ39cnAP9UPjbOO0IOeojKa17LBale5t2LPj6IKWcf4L22k+q7D7oc\n+Ew4xMq8DGbl/mJqnpn9OvYYoBHh9ur7psJ6ST4qzrCqz0wqvlosy0pkUdFr\ngXKS/uwJYkuJcG63bSFXCIUgrew6D/e4yLnc+uTA3RUM+oxhHhmWqZDR20ha\nV1W+7Dk6PlED1oRLqsl/wDG6RdEyaC6wZSuksJRM0uK9tVn1D6koyadNjQ+w\n+33CaybU8/QdMtduaRG1KzC2gkfeF+9i3Jz7ys7ZO1HoaFNZdnJLFlYNRtmd\ncyDh\r\n=hTcW\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/extension","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","engines":{"vscode":"^1.5.0"},"scripts":{"watch":"gulp watch-extension:merge-conflict","compile":"gulp compile-extension:merge-conflict"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","dependencies":{"vscode-nls":"^4.0.0"},"_hasShrinkwrap":false,"readmeFilename":"README.md","devDependencies":{"@types/node":"^12.11.7"},"activationEvents":["*"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.e4c77cdd6e_1581553585107_0.8574384543805258","host":"s3://npm-registry-packages"}},"0.3.0-next.f8014d4957":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.f8014d4957","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.f8014d4957","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"bcf04323641de0b20efbf7ec157ab319bc650119","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.f8014d4957.tgz","fileCount":12,"integrity":"sha512-sDiQMhPNhFBUtLdIartiYHTjUSEUZSBgTlsjJPuHU+HT1xNGJnFak9V16aOCA74jddXLMlrgWqgVPLDVt8rR8A==","signatures":[{"sig":"MEUCIQC8m36YbeZBmixt12zid/04IBa97wvthSlmzWswWz0D8QIgJw2oSVvWE3FiJfCaiLa5jbttQDKr5u2ovaV65THKWPE=","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":110473,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.4\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJeRekeCRA9TVsSAnZWagAAAkoQAII/mj+AKWvp+ApKc04+\nW7XjZvulWQqng1ZjNoPUG9ab+/hmmSDjRfihdDPjpZ/9Ptn0UXLxlUACcN5z\nx13Ga0ScnZfB/aVaVRNwi3TylPfNBPSmsg62Rrt8SPM7JHSOhuV07/5urGTk\nH4LtbgUf2Hd/CiaSog49PF8+8orWwda3E6TIK+OsEpmNUGHvyR3jPBWRBjbI\nUNDmJFITZ6u0TCXhH+cM8Qiykw6/wazuezK4443jv/fDzfTB8iG2svU6+BJW\n2V9ev0hnWKw3+AIqAcWw3wp3fOJ6xIqd2a13Hbb/CCW8bya/MCFHSG1VTM0s\nldi5NuTP/d3tXnWppe9UhioZdC74mzfaWRvESxI5r56/VH+ETFRlOKROmqlH\n1ewHeRC9U64ESZXeGJ7oSI0C2Z2A61seapfHzG2BsQ668nUX/6i06zzG+KPO\nKyalSM9n/7bJ6Gsl/8YVXMju1BSicJZIQCIG4m9ci9rip3Qqdeiw9dDQUHA6\n3mUBK9rQC/d2EC0CXlsSBIa3DCq3bNF87+oUXMl0juq5NlW9cP992nnQdw3K\nP10cD4W6qYRR+Gu2ylP0tpxhwyud5RgAeiVmDVuHerX3n4aEPbHX6kp/pKLA\nYjpNMBZnjYMyqCMZxrZZDxWqsrXnL72Avj02iLtKDwuLqn1NL6nX16NavCdF\n3imZ\r\n=c5yy\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/extension","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","engines":{"vscode":"^1.5.0"},"scripts":{"watch":"gulp watch-extension:merge-conflict","compile":"gulp compile-extension:merge-conflict"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","dependencies":{"vscode-nls":"^4.0.0"},"_hasShrinkwrap":false,"readmeFilename":"README.md","devDependencies":{"@types/node":"^12.11.7"},"activationEvents":["*"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.f8014d4957_1581639966022_0.6154343353824183","host":"s3://npm-registry-packages"}},"0.3.0-next.5c017be321":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.5c017be321","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.5c017be321","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"d0c629c6d41042e0c6a35cc7a8566d2ec40acab5","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.5c017be321.tgz","fileCount":12,"integrity":"sha512-3uhJNsgeiqSLEa+pHR/9TnIwH3Gk72sXOgpfWEQnL2tiRbt8KY6KaOfl/wvpxH9n+fTqknNc9Ey1sQ2WPlxqeQ==","signatures":[{"sig":"MEYCIQDSlxELsBIcpACswqcd7eMY/MKEhtbwvypMmiBqijiYjQIhAKTMnHFnKIzFsu15x8De0bv1bdg/N6MZaSttcA3j7hSX","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":110473,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.4\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJeRzqcCRA9TVsSAnZWagAAgLIP/1sKmf+Qm1NcDNqE39w1\n3wJG3UTR2pCdMheQ4pQd0feohTB54qRsxTvK7Scw4UaXZK/YUPxpGA4LOt0k\nnjC2GPtZRLpfjBsD1lgU1201xWayFk5Qq+mVJROBqaddDYtiK8Aw/jlACUW9\ntoNH3KVI8sfL5O2vvomj1SfKuQraa8/22WSuwM1fQ5E9itizbvUeIUihyOO5\nNpzyoZt2oYgfM886Kj1OOzgzS2eUx19ATV1p7OutbDKR6VedbS+GlY8VQoZa\nYhxuHjMOHzy+NrSO24B1Q0CHTKpPCNW7XgZBQQGiw4+J7ZzBIW0wKyZpfTgy\nD2cm7GDG4S8OqD+L1Xg0rlD+BYMmyN8ImvqljDuEUUNY57LkTfzwLD+wAEvy\n/iJ9PdJrZaQool59LZXsihBJcgX/MCSe3HWNHmKDvPe+ovxkQ1pENIMgodsZ\nksyVDyHWJ7LW4cPkwxQIWmx9YOReZ6mir85pJTBW1PP6s9inv3+/IFCOVC+7\njRsrzdxdK1z7o3c3c1qHXoanj2KK3fXTkBeCDHIF3RlX5XVw2HpKc/Ldztda\nxrumoPiEr/UJnL03Z2Kb3xx5IxFehz5JJ4k/Lkv091+zp1Bu7dN7tgDxs+AI\nHG4kYxVcOwYtcxHUtkhAsE1YiH+Am54p5d7bjzoEWbqCgr9ZHDLxrtYwz7ky\nVFp7\r\n=yCcK\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/extension","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","engines":{"vscode":"^1.5.0"},"scripts":{"watch":"gulp watch-extension:merge-conflict","compile":"gulp compile-extension:merge-conflict"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","dependencies":{"vscode-nls":"^4.0.0"},"_hasShrinkwrap":false,"readmeFilename":"README.md","devDependencies":{"@types/node":"^12.11.7"},"activationEvents":["*"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.5c017be321_1581726364121_0.683579973523875","host":"s3://npm-registry-packages"}},"0.3.0-next.6ec6f9e3f4":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.6ec6f9e3f4","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.6ec6f9e3f4","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"3136d8046c1c0118d3ae6efa88ba0bba686be229","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.6ec6f9e3f4.tgz","fileCount":12,"integrity":"sha512-/ZYMjIR9kXi470UqkpABssdYhWfkTwHtmeYd7C/DqsNzPsrbq4uDOyjzUyCrIAYoLtTXnFaSLl10g9vZxKkYdA==","signatures":[{"sig":"MEUCIQDrPmyVnPWR66/d/6ZX6CC3uQ4/8YMrm9kDLEizqv52CgIgQuHOSfFSOGj6t7dNHIVHmmaem8LSQr5u8Mf5M3eSqaE=","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":110473,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.4\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJeSIwsCRA9TVsSAnZWagAA6RkP/R0aW3bVxaL1qin+s/dX\nho8Mne82t9+jrBvolfp+ahWs595LHTxGVIKis4YUuCDQqI7KAYIQhXlhTvPM\n+E5eqNeCGuGqWATEHygDlMJqmaT+hOzKVWYf49zmSgqhsrahcC6hFwHoIIbz\nXvA8dAwZE041T6dYXReiq0dlTYqSkPmInrJnKjSQB4F3pw5HN2lmqwL0Kuwb\nrL8GQIW8vLbVNWcj4e4DZUBUYfnsvBZZwmt1dIH7tuUtDdxozgj4dilby/tm\nfSTy3daQojnXWyPpHql3xSM2IsERlcl93ba02NXWjeg3oAt9azBB9tBHdCII\n0Fv/N/M7+HnSaI0rmcyLIy+XMRfyWT6UpZbaQsOIbBDCQpnrxt3h3K0ScgJz\nL20iDYdm3ItOMsuyCbThv5qqRhqIV7sXkxTYTwtx5vPBdKI43BZNJBYkoNZT\ngKDkmLy62Rujva176mdSgXEvdHtGoOTszQRXZufGYufgz3XzsDlNwj8Bs3w0\na8cUYPiAjV/FjkYwiKYbDzp9hnirgV4VV+eg9kL3mo2zPcWFnajxvd7epw1a\nJl3BIwP/IZjX7OBwfAlXlyHVI5wAVjYeZ8hAMyxhq6WJWma2COLOO8rsUIGK\nOSpYIBI6vghX5hiacCt90rex2jbCWgFhQXqsH3L+nv/rk8xhsnmKnEPBKIoi\nlf/P\r\n=oLSb\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/extension","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","engines":{"vscode":"^1.5.0"},"scripts":{"watch":"gulp watch-extension:merge-conflict","compile":"gulp compile-extension:merge-conflict"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","dependencies":{"vscode-nls":"^4.0.0"},"_hasShrinkwrap":false,"readmeFilename":"README.md","devDependencies":{"@types/node":"^12.11.7"},"activationEvents":["*"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.6ec6f9e3f4_1581812779886_0.5648605392006685","host":"s3://npm-registry-packages"}},"0.3.0-next.186354f536":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.186354f536","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.186354f536","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"9f6086d7f686a37858e25009073deedc7cfd987e","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.186354f536.tgz","fileCount":12,"integrity":"sha512-e4MYovVqh1wImn5OWL6YnvMKLWICGyi7QutKImtuBjo9/ZtmWUmRJeYN3fTwxD7inP6S6ZaKzoQF0OFLTityAA==","signatures":[{"sig":"MEUCIQDqBY7+20FUdqua269haYt7OgU1bBIN/MBqeFZxJ+2wdwIgZwt0uBYm2tbxuqVpi+pFHr10RC2NyXk1at1w2rPdhIs=","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":110473,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.4\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJeSy7KCRA9TVsSAnZWagAAr0YP/ib+e9LU8PqfAfQa+I+9\nyT7S+IjzCedr45hTa//ChJwl3Pood2n7D1cd00HowkLnEXOjvp9pauPBsOt4\noE1LTxW+7KlGBQ710aEt7QAMwwomG5gmngsKHOrlP/Gj4olWTY4tLxTdkSIS\n5azKh/7omrSjr7FmtQTHf9o+PA6RK3KBCrMZfRB4U5bIcRb8PdaBjKzmdZk6\nURyUL8cCON5AEa+n5A8llROu0auCzm7nNCE66LWcbuWUdaPnKLpGTLtwAiBD\nP6ct/uegosZT8kbYsXzJ18I4L+YarYs+HLECYGGblhZQu0/oRhXNXTtFb8kP\n8Ei7jD5QieL/qnIkCheHzhJeEHLNiQ7AIzpaP8qpRHwtKOF7wJcAe6Xxbyu8\ntv89u9uvxpg9ATgw7ssQe/ifcmyyWJxA0fEOeG5NFKYbWElk3iLmPreE7Qti\n++zZVfKiamS/9c/xBB6zeAzmvGRUmps5B5HCM7zQuAMfT7Vf2ustbnP35bWl\n0o3wSFxPGGRa+RxQKkmH3HHJRVHyczUs4qHuj85bqVocr3OtkTIStVfnIjH3\n8Pe2th0aLSjmzpVVKnC+Grt1h5ngPeJunZTc5SBM9xOdo5t1M9PrW5ev31y1\nAsZxDVDR/B1jBO0b4YBTT5JKt/6SFvr64+LLUM9qQGf38MLKQ1R+5z886xRt\nW8ZL\r\n=+yOE\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/extension","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","engines":{"vscode":"^1.5.0"},"scripts":{"watch":"gulp watch-extension:merge-conflict","compile":"gulp compile-extension:merge-conflict"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","dependencies":{"vscode-nls":"^4.0.0"},"_hasShrinkwrap":false,"readmeFilename":"README.md","devDependencies":{"@types/node":"^12.11.7"},"activationEvents":["*"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.186354f536_1581985481555_0.7870833279875402","host":"s3://npm-registry-packages"}},"0.3.0-next.9bc92b48d9":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.9bc92b48d9","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.9bc92b48d9","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"a4c82d88c5a8b42566fa7b47261a506f7bfef653","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.9bc92b48d9.tgz","fileCount":12,"integrity":"sha512-rBvBrZhHHaFbV2QN9xQidpsk65TuVp2sGLeAHwzdMnRVYOx9b87pBJybhJa78jMn0rjO9+Ob5+ypEzjaGmWwkw==","signatures":[{"sig":"MEUCID9gYiY9PzVUVo0gmC9WJgKZoGMjiDLbjs8EjYG4Rn4aAiEApheC83tp3WN4t+Vj4mn/XGsVyOzMZchq33Fx3uISLPU=","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":110473,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.4\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJeTIEbCRA9TVsSAnZWagAAf4UP/1uvl+ecFhvv2ZNYmHOY\ns375dfaXxmaUauu+6dLDIXa9MsZU+ZduRbH8ql5vIfCJn5kLmjgPBZhH4ejI\nw9TAh8pF3I7XxJyWzg8XQyIHmLLwTZy8tuBAA09HGQTj5Bg0W2hJr2QeWgj+\nB5KFXeOtuj1/gDUtD89YC/ylRMiYuwZKIUeRm64TUfWO9Uz545kSbDdw6TV1\nlt4dX7XLL4UlPicScZ2tRsZzSRXDA6lh5ZKiT2R0yvm7Oy6ydqqgVJn3Fa3g\njh8qpTGHciwdpr1X5D357jSvtFYH8+sBodzy/R3Rt4GPA8GjQ4Z1gcJyAqS+\nTkQzET24FLL7+pZFtopoG7pfBt37A7eLeMopF3rzygkBYAPps8/HY9nkOYnO\nKKAv3VIW03bVyZ8nK0j9/AT8AGPJpJig/kVL3XdUalePIA3KP91mxEGe5lEg\nuEnYY3inAm6VZxK3+3sysJO3onbQPOa8xewJsbCj7wUw5CGEdpsRHk2dwCIu\njDVZkGPPaEYdeEpdqvoem3Ds1nfMAfSsT4iSyixZR/lTfTqBiMbYtDIU128S\nJLC47e+TAMecXPmrAJKj4zOi2sKvVfR8ZLmaPWHq/QufRKG17LfZfHpE1ImT\nZSpCydawPLmRKGckhSwTjb2mBWzVEYr10imveBuHKhhaYN7a/uT5l3qDRqlx\n532g\r\n=WwFI\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/extension","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","engines":{"vscode":"^1.5.0"},"scripts":{"watch":"gulp watch-extension:merge-conflict","compile":"gulp compile-extension:merge-conflict"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","dependencies":{"vscode-nls":"^4.0.0"},"_hasShrinkwrap":false,"readmeFilename":"README.md","devDependencies":{"@types/node":"^12.11.7"},"activationEvents":["*"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.9bc92b48d9_1582072091124_0.7014400965643643","host":"s3://npm-registry-packages"}},"0.3.0-next.0c35df5391":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.0c35df5391","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.0c35df5391","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"bdde3d3b879ef50e9a11ab73366a306e90b29416","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.0c35df5391.tgz","fileCount":12,"integrity":"sha512-KpRt7niMnkGC0RMN39IxaejYnpp17GQVslXDPM2Vgq6XT2ZmvE9PR/njltG4zCImJs3dDrRTWmYGRWDH3YV1DQ==","signatures":[{"sig":"MEYCIQDN+1HR8gEszLc7sAv3+0V2R/unBqJZcly8h1MnIKz0PwIhAOZxicM4LQIes+RJUOEcDs8f0EOWpEruCo/Wiu3onFt6","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":110473,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.4\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJeTdGbCRA9TVsSAnZWagAAxBwP+wfJjTGcnwmviYd1pX7g\nMXsm8xisPDn/8g5YidTsX0VLGxiIjV25hb/d/1GVbocrjWEtwvUYzoJjXRs7\neJN+ONPRXyd7d0JHZYZMJspkPgEczN0PE7mnIiEA3r3L6JkiJrd8WvHbp7xm\nAJLhDRIAAR8czuteRQuIM+MIw5J3iyDrNMh+cXiteGNWadQTCEdbJCYkTyTA\n4GmrJMHFKAqH7YvPWKA526pEB8cWufWmH85cMTFPzih22eJR4tWX3t6rklfa\nB1DVNnTP26FtA1SsDk9glUm91cKupyq/eFbaaySgs8BCJHXyPETU/nSjxxyd\nIavEZ8xD6NPZ9msnnITaKhGTxgcCaL8biUyt9nXCEXZxqiOB3x17y/zZZDTT\nhsOtrGViaMlYMjqDp3Pnt/Qj87Bl0Y29dXlfZEni/Ve/cXV5gtyphEj/9dGW\nFMvh8tncQ+LLlYY2cLcBX2MoVjWpsbHiL2Lxb13LWaKs1UwLjDvh+0Rpqum/\n35kYbhuGNQIpaRIIxlplEKB+crojSO1gaQVeVYWZFmfEIxq8nfCYEOtDbuyf\ntTJj5HiCN78gAJ9yJ65ewPT5dga4NjMHTnlnsikDganP9n7oVPiYEpFhoZJi\nNhhmyI6V6lLovDfc1lXGf0EWjT1P67yuMlwNQRj57cGYSVt9IE7mBjYl3E6T\nBR64\r\n=catI\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/extension","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","engines":{"vscode":"^1.5.0"},"scripts":{"watch":"gulp watch-extension:merge-conflict","compile":"gulp compile-extension:merge-conflict"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","dependencies":{"vscode-nls":"^4.0.0"},"_hasShrinkwrap":false,"readmeFilename":"README.md","devDependencies":{"@types/node":"^12.11.7"},"activationEvents":["*"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.0c35df5391_1582158235435_0.3382481796144319","host":"s3://npm-registry-packages"}},"0.3.0-next.7fc5d91505":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.7fc5d91505","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.7fc5d91505","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"1f47e70bb5c948c3202a95845a30a2c57ac30f6c","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.7fc5d91505.tgz","fileCount":12,"integrity":"sha512-E3jA35teak3X50RxBpDv3WC7HCBTY3fAIlOBBQOmtKh1gMfBT6S9QXWy9Xr8SB+uqw+zEcAn4yEu1XMLb5D7VQ==","signatures":[{"sig":"MEUCIQDiry2GTcRW2BRgfq3Qk4THOeH01L3bfFDYYFolAbZugAIgftcdJBqmVqf3DCOa8EXRI6v3wbMdYnuApyiaACoQRKI=","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":110473,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.4\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJeUcc0CRA9TVsSAnZWagAAr6kQAIjO67q5KqyuwuugiosL\nZh/esWpiraoa3GJXyhseR89o4iYu3y1aYY+zSK2pLa9Dc2TL1X3AQ51NRCUb\njHBX2efa/WO8/SNot3j0SPyt6z13XdIiGUiqpGDa3A/cGsuBZT5B/IxrgRdN\n1r7gsNW/NZxI/46AOr5xyyome1eOsN6V8d++D+AkMimZqSgEY7wMsaIUhXmW\nZowCNGohq54GMVFFAaMf0kbYoSVxCKX3CN35R5kVyZpCrhXwcW+0fpq5rDo5\nPKX+/Um0bwQoalP2Op1X5ZZeI3fwNTsXctU9Se+Zw1MdcXHauRudYB/w+vhU\ncOjGGfQP55stfWPV81dCA8Esszbl81m6CUDpQPnPwKVdz3Sp0ZWfaSMer0l7\ndwmWm7vOwxUsuKyhHISOFxzpk1Ck9xvZY908NiIP/967G82leGD6nLTfVtca\nEyTdf0FfTnyK4souWmtePx5KjN/06+iltT1Kz8LqLCBkX8u+E2J5mtWQiWGk\nb9g6kosAAkwZAAJbquBfnG7ja7EDhiIEpo4Xszre+54PmcSL2cWxOoikGNIv\nYDIh/aKo6WaK0tgQBZj7bQ0YeOo3iXMu/1YqTLyQEi1l2NNOs01TwwI21Ldj\nShHx/BAXvaUXEMI9u4GISCSKV8TVGwTKG7675IOK8KJU6R+wdKYwTZxBc6gn\n5PeF\r\n=Kkqs\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/extension","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","engines":{"vscode":"^1.5.0"},"scripts":{"watch":"gulp watch-extension:merge-conflict","compile":"gulp compile-extension:merge-conflict"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","dependencies":{"vscode-nls":"^4.0.0"},"_hasShrinkwrap":false,"readmeFilename":"README.md","devDependencies":{"@types/node":"^12.11.7"},"activationEvents":["*"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.7fc5d91505_1582417716354_0.2703831816062474","host":"s3://npm-registry-packages"}},"0.3.0-next.07c33977da":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.07c33977da","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.07c33977da","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"44e8ce34a3962861f77321e9ce969b60e43864c0","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.07c33977da.tgz","fileCount":12,"integrity":"sha512-TeIXot4uqZ37h4fl4OrCyPGE8f9X9ezfW9usYLY3gXIQBg0h/042tNJQn1zIK6qhM9dGeS3tWS3cwo6gl8OEmw==","signatures":[{"sig":"MEUCIQCwWZrJhsRFFHqxIIjp65xH+1cFd0N2AThba6Ef+wq9TQIgGvN7Crztv+7cBHRHiEbPTh0UZkDy9lYp/CHHzcARtGM=","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":110473,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.4\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJeUxh7CRA9TVsSAnZWagAApV0P/RAibURZKGDA7bp4bjSi\nADRkK0aYynHsCA4u/H7sctjy8VnNgkiTpphJuvYQ+/OyhQAf6KJZHIqNobRO\nImPTSUx5WymGAETjSGYD068rEzRDeAVdGUlnjGFDd8/2x9i2ASJBxLmP/4GS\nO8OWS+wIfkHJkbiv/deDVIIbF2gzjjf8tmU21b0GZ5Bq9sbz6SJEOXLRdAOl\nEKnP3O6D6C7XTbUyNj/HHx9VqswKz9jbe6cJf6rtHF56RmPpBwP85hl+TP4N\nuJZQ7kpO8CpuD1UbKRZziNuRhz9lBuIbuqY7G2N6YSED7UrOSNdLj4cqsScb\nLnhXVJcsAlqs3bdNUZAcbJF0mJ5a1lIizVLhx1Mw+5IqEK9MC72REK8meyrx\naZOW9p4avwYr5Byb2Hnmr2gBX23zvrYjTCcnS8JfiCaSu1WByy+bssyR0SPu\n1I9RfQX1FzHAQSC7ROQxLMBSpk26ioVhp0TMBhoZdR6/+b8pHmWmDfYH7Goj\nE5iGn4/Kh7lFwbY6QmQyBil+QZvH41w7NQiXR4SQ9sX5D4M4UzncCQUGybPZ\nJg+gt9dpl/HQ/PEZTnc8VVZqxn7fOXVD+W8ziKANcj+mfgoH04XqRsKFoVY0\n+x0Ni9HFaow/TEnSXBBow+sJmmdNApdtAFOH/lq+OhrdPjUbz9uUCIifUnYj\nFG0b\r\n=1V3a\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/extension","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","engines":{"vscode":"^1.5.0"},"scripts":{"watch":"gulp watch-extension:merge-conflict","compile":"gulp compile-extension:merge-conflict"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","dependencies":{"vscode-nls":"^4.0.0"},"_hasShrinkwrap":false,"readmeFilename":"README.md","devDependencies":{"@types/node":"^12.11.7"},"activationEvents":["*"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.07c33977da_1582504058956_0.1283484709194227","host":"s3://npm-registry-packages"}},"0.3.0-next.915089a8aa":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.915089a8aa","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.915089a8aa","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"bc405f4360ce4b3c3c568dfb0fec5a78c92dd0fc","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.915089a8aa.tgz","fileCount":12,"integrity":"sha512-oMnTctRcInQJswQMmCKVgLZkjwbwZKxySVWM99p+e5tcBZ6ZZWtwlBlY2+aSgAbHaXPkLXzlLhUJS044OqrWNA==","signatures":[{"sig":"MEQCIB1528d5uwmo3WfYAq/S9lg3sgwRR2mjivaCYY/uTw4oAiB9QRpX9HdoHOfAIOSpcjxDQiboJu0V6JjzCiBEhdwglA==","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":110473,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.4\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJeVGnKCRA9TVsSAnZWagAAT9IP/1WA0yltpd4L6SqfCoMF\ng0TRQGTM7W6pgNPSSDHfgQwK2Vv7a+p4V+qbeBF8dBPXkG5lIi4Xwhetx0mQ\nKwfULyRwC7vlZ2zhKXr9X7c+0riNJWyuXgfdab1Rd86vnEBJXA5MsEmwWUc7\n69km4kWbgsOvAxE3l2JUj+Ye9rZvrmWi9CIV+SWPG9MqUoJKzqm6Eu5wSzlx\nTqJdYXehjHSvTqdohoYblh2w/bcvfPlpbOBGMScGorWoiU27xNKjm8s1AVXr\n+dXAWbSoyKYoWirJlmG7uteQjzgcU12LIFtsqqlug/7rwrMvOsGs6kvr5V28\nXKyDf02y0PdaF+YHW92Pt5SJQKWgUYFIfSRCPIFAWnL8o6Zj5WJTxAjiHYgD\nhGbhQiktI+SL/BwVeemtCd1qEHj9EN5ilahaBSiSrfUuyEpQBi0+McaiZHZ6\nSMv5jBV/5SJd4OcImLayMrCcpb2TEnlm1JUq/lJKkPsutHkdi/1AWp+m+Cga\n5oMssQrbWdnk9zcMcLPL2oZbtbbTxXndETwp9JfxkDju/frV7FOk+iew4PdD\nVaM8tFI0JYTwIlD/rEHmASDTn4e39cNzAEtBR9A5rAwkmM66yG1p3NzLv4Wz\nrRRC650dK2r7InE3y7Mr0Z7Ax+E+tp0qLHqjIDXNmDJRdP8RDevHKO8kXi/z\nkXqV\r\n=waow\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/extension","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","engines":{"vscode":"^1.5.0"},"scripts":{"watch":"gulp watch-extension:merge-conflict","compile":"gulp compile-extension:merge-conflict"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","dependencies":{"vscode-nls":"^4.0.0"},"_hasShrinkwrap":false,"readmeFilename":"README.md","devDependencies":{"@types/node":"^12.11.7"},"activationEvents":["*"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.915089a8aa_1582590409958_0.5820870295281921","host":"s3://npm-registry-packages"}},"0.3.0-next.a0dbbaa455":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.a0dbbaa455","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.a0dbbaa455","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"d6ec1fe36513fe096e3229da62cee790153c4695","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.a0dbbaa455.tgz","fileCount":12,"integrity":"sha512-ud8Y7aTzVsJtBF5M7anjBJz1LnMLCdhu0MicXYwgmXzsyklDIdcXWpAFm/lK+VxndN2w6GxWMQkvlvhzMRbjvA==","signatures":[{"sig":"MEUCIDSBtkA0LDn3oOyMIyTffXuD1NQqUY+jm6er3C3cyAImAiEAvCeeV0WlvZqAefi3cWD3L0CERnik0DcTJAyjZfw0XRI=","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":110473,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.4\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJeVbsQCRA9TVsSAnZWagAA7EkP/RvISFFy2jFT+wAYeFjC\nGbHl7XkA9F0UZJ/2d+8IEaIj7mj0yCEzeKRSwM1riH64M0IHgOSt2ROpfl8g\n496oAxa4TaFSGOUieWXuLCcDdClqITDSn/mNX1OLgZme9UkeHBOpZf29/Hu5\n3dt8pIL2XFjeXCWQFVIvP7P+NZz3QCbjjZ8LRdqD4DD+WKQpN2JuD8prsU26\nON49g7KPeK+MoMa7gNJSjFhmG5UvKMRnvkpyFoWZSItLtpM9OiHBjYoTEPqe\np2ICfokMSa5ZLHmrdQSZdxvCjcU1aYZyJW5I+iL664thy9qQ5k9TjJOb4yA5\nVfqUWG6rqgUwsajI2+NEZiyR/nBbJjEIK+TwjwAQZ5sDHDUTAHbK4L+VGulL\n1dU34bl+MRA++f9FA4YGvpYXJNvyQ2RJt5JOnS/8nQC7SYonT3gapfT5dQNT\nqOJ1SqTnPTckis42LbZsClR7I/HuwjsUAy1QKo8/TTlFk1mTWPondi6Sy1RS\nnpVUErvT862r+5EUicVt0F9vlfu2zebMqLw1bxyEqUawOp32/TH8H6Ofa2Oi\nzHBMGQyODxjxJBmm89dB0hZ8iQXaHutd+MiNogdYte+96hKOsRIqfHFG5WRg\n12p6GUPRnE3fi9jeeudAjdVW2Teu+VsDqSzSKc9H0CDhu2/1wKo+ngf7xiNs\noHQo\r\n=FDNN\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/extension","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","engines":{"vscode":"^1.5.0"},"scripts":{"watch":"gulp watch-extension:merge-conflict","compile":"gulp compile-extension:merge-conflict"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","dependencies":{"vscode-nls":"^4.0.0"},"_hasShrinkwrap":false,"readmeFilename":"README.md","devDependencies":{"@types/node":"^12.11.7"},"activationEvents":["*"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.a0dbbaa455_1582676751927_0.40701379441329366","host":"s3://npm-registry-packages"}},"0.3.0-next.24aeb687f7":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.24aeb687f7","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.24aeb687f7","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"669d086be05754fa5197d29e1ece409a1635f390","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.24aeb687f7.tgz","fileCount":12,"integrity":"sha512-m0w9PQccRd+wEOpFV+C0eWduS0YTn/fzzBufwuBcntj3wYGRn+UbE0DetKWh6CU4D7QrE7bAeum5dXc9MJDGFg==","signatures":[{"sig":"MEYCIQChjyNABp9TjCkJN0gkDprAbdNBvVJHTqJYEKAFK/LA0wIhAOSX4yWGRtvML8S0Vqx8CWEZZiFyYMUz4q7BKnBKwxHD","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":110473,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.4\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJeVw2QCRA9TVsSAnZWagAAd54P/3bdsfDQNRgR+CrjCvIM\n6DctU2tNc2YXO2Uuqs3ANIyxEAD2CfzIUUWlGKASaJyQtkrdy0+HtdBXx+Do\neCUyWewH+INypJabW4OzaI729KLNQniX9E6JKohrztb4dGxEQTuRQxI1BkS/\nsn95Wza684ljOml26T2Zl7rcUIqkYTBZLNe5KOPeiq8rLEdVFgKjuy0MVy5j\nNw8tA+qXBeZdWKXOi+m4pyOuHQltQ6lGjjNNxsoQFLgGkZ8/07cr94vXaH+9\nRMhxPbqjoh5IZlraW1E8WBHU8Rn5bBv350OPAnz+ZBMj7eG9I99Bn3fLZEvU\nYJZ8PXs30oZcpayqzpkq7cVsUT5q2MtV/idYHFQEMNBB7I5UozNSVMU8hjoR\nV4LGSWn68/miothMbT3Baf7J/XjnryRv2b6Yhm+IUrKVji8dX9YcQbjZ384z\nJqz2DeGtcrusXEeOQ3R61MpkvuwTP3I0Op4SoB7swBWf3xPs2dLdJdfsPqdd\n0bX7p6ZWAMQwm6Iqd/XHFbKpuWQuUkNx6nhPEETrZ/KNA+xVSIggyapJADyB\ndwldRe1/QHL6019WtJzrbC9BV7EF0hJAmWUKiD38HoOuNFNf61qSqcsrDM1k\naNbkVofVQkVwUK0O01RDqcavzU3ZpuG0xsKCSQR9rIPYBL2S2ih3IRB1F7yG\neGAt\r\n=fcSa\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/extension","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","engines":{"vscode":"^1.5.0"},"scripts":{"watch":"gulp watch-extension:merge-conflict","compile":"gulp compile-extension:merge-conflict"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","dependencies":{"vscode-nls":"^4.0.0"},"_hasShrinkwrap":false,"readmeFilename":"README.md","devDependencies":{"@types/node":"^12.11.7"},"activationEvents":["*"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.24aeb687f7_1582763407974_0.5872924649130025","host":"s3://npm-registry-packages"}},"0.3.0-next.e5834d3280":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.e5834d3280","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.e5834d3280","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"b147d3b30502660d5c1e68beddd55c5ece34f021","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.e5834d3280.tgz","fileCount":12,"integrity":"sha512-bkDAAo5A/lYkDUlrVYeXxKeXugAgiitz/xSM1RDBFKgHxvPvq6hGaYvPmsFUj4frMIYJPeVdVJ+g5+6sKSrJBg==","signatures":[{"sig":"MEUCIAVKIj4ajlC3UbO2iESlT5MdJTOha2FNDqIuxpiIUlYbAiEAlj5BrA/TyPCpvEiemcZmxWa6S/hZMnDWXkEZiiCTBFg=","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":110473,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.4\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJeWF4cCRA9TVsSAnZWagAAT3kP/i8DITLPCLdM0urrf9a2\nor1DujyPfXQbNHim5MdhUleAp/0YNzrQMOa5UxTJrscHknbJcY1IxECiLX6Q\nqwC02t2lDnC/ViPpwylVN6oWi5rLRS9ZXzypLYI4EUUTkOg4usARFB9kT2+l\n9Xfij5psKM8ruSNPlYQDAeVwqq3unDrfsXHyltlWwuE4sY+9DL4uf+qWNdXg\nUv1F13wXlkLrfSwQY2K60qZ9j6I71DboubR0rwMVg16kmySvCLOGiYNb2fBO\nTEgagS83crToIAHGUC3eKWAa6yJiPPsqI0K/kZaBP7j0LJfWYTA/5liUVLGc\nIZdFJ0auoJIMD4vCbKgat0dpd/OwojagS8guelge2aVsuOVDF42wW9x/CChn\nWQbj8a7Jt6zhzpfiErJXrxpkSczhT9NEnAZhEIxzhOK2dAhu7UVDlHR2WHLi\nr1Ny6/843PoHCYcUnTlCIqrTbY8xJpieKt5oeuU3XGf+0kv4J1y1fBfbCso+\nyblCZ8QVfAvEn59rhqZOizlkxFf+w0/UNvtff0Y4L5PfEw98sGmqM4NKwtU3\nuZ6Vn97GAikhevgfdRVJVnFmGYe3szh9HESTgOiFcBgo6G4Ud02QEq7xuyv7\nR8N3cPpQDpMGY7IN4O2NCwDKdCVUuC+P9HE8OVbH4UhVJxpGQNErizHn04L0\nL9YJ\r\n=QZJc\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/extension","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","engines":{"vscode":"^1.5.0"},"scripts":{"watch":"gulp watch-extension:merge-conflict","compile":"gulp compile-extension:merge-conflict"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","dependencies":{"vscode-nls":"^4.0.0"},"_hasShrinkwrap":false,"readmeFilename":"README.md","devDependencies":{"@types/node":"^12.11.7"},"activationEvents":["*"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.e5834d3280_1582849563791_0.34497323276426384","host":"s3://npm-registry-packages"}},"0.3.0-next.fc9543ac88":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.fc9543ac88","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.fc9543ac88","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"bc645319d5599f84dae486325f775d0db137182c","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.fc9543ac88.tgz","fileCount":12,"integrity":"sha512-hTx3bmR7gl0mm8OJKXlfoT36oAXgUIiMs+eXw+dyCPY4JpmhhbwI19t+aeg7vqWbJC2mP7GyE3uV8fIZTbBPtg==","signatures":[{"sig":"MEYCIQDaK8hLb5rC//RLJoJv7N1dwYvZc47N4W6IuBgJesA/EgIhAKk6nHJHoJ9DcuZtVFF8aCRNPWMALQ+hZdRzH4Mtwyna","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":110473,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.4\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJeWa+iCRA9TVsSAnZWagAA3RgP/30OWSTNtCnkePgULlYS\ne+4gGIrkL/iKHjkifELLluOsiV0UIhN9WemgK0m9ISuo4WWykXD0bli64afH\nNtHDrpDyO0aDXhOKIZ/KToxhj9ykR8GpHK/VsbSiPda+7t2ihVRhyqwtG87i\n0/zhJqiIh8l6jN1ZQdQiRkhsnlVAdcOaEJ3k36draAxz+WdeqBz9PcbVvawy\nRo4rVuhAavuHn35KfG+tpbpuEZgkyJCmUI/QevmxyfE/ehLWl943zh2p9q/j\noEHgb39YIrGk0M7VN1Qi/VMEIoFdD0YFGc+fCUDPCJp6J7O+ealfNNU+kqYT\nAS7L6ntcLwUdBRnsx3pItfRP85t/4GTISr6QHAMqOeNxVr9OcKwYDs0i3zvj\nMZP4tlL3MFQnzzIgtHlMz8zh4grYHOOdtpXS2un/i+8KQMUdwShDFBa98BFn\nF3wByto5ZBXmG7EJlmGkPFnf33KOuX3JIlDYlC0K74CUcLge7+VP2LO/CmHd\nWCwy6i5dlebE9RFfhcpDOCR+9pqlIH/KPQTvb5YygdPrS/v3ZW2bQn1DR4RA\n/5PVD8js+8SiP31AWtVv2LSGunC1VNXvSnEJVj7k/Dswpwc5dOwGjZZOdYXs\nsv1vsikGMszACKys6+ZiIDTmhtpiqDfwHs5RVYBltUHMMjPgJq0BFRMwVefV\n5i3g\r\n=w6KE\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/extension","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","engines":{"vscode":"^1.5.0"},"scripts":{"watch":"gulp watch-extension:merge-conflict","compile":"gulp compile-extension:merge-conflict"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","dependencies":{"vscode-nls":"^4.0.0"},"_hasShrinkwrap":false,"readmeFilename":"README.md","devDependencies":{"@types/node":"^12.11.7"},"activationEvents":["*"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.fc9543ac88_1582935970247_0.20743883282255893","host":"s3://npm-registry-packages"}},"0.3.0-next.77dcee274b":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.77dcee274b","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.77dcee274b","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"d3fd5f83efcaca4112df38266699cb79738415bf","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.77dcee274b.tgz","fileCount":12,"integrity":"sha512-gsRbd2m54FfppWU7meoWQaHPVaCmRZbNcdnHvoV81ujJsbqZCIRN3r/3CC5+9SViHK7PR6KGmByOZzBI7nBmsA==","signatures":[{"sig":"MEUCIQCr5FF74oIuO8hevgXvhHHJ3V4WA4EcLpS8o0ASm76OBQIgY8aKJzesIdQ6a8b4IJp2A4AAWlMjff3hJshYzpPmaEQ=","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":110629,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.4\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJeWwFuCRA9TVsSAnZWagAAprcP/izHS7MdHjbI50WFXwwJ\nVTo8nLcGVMkfiFPrzm6AqO8zbNKBcFtpnIEoD6dh8e0PdGnxDts90z3gA7U+\nWinsaRV415BMCT5R4H5o3Ws1MmimQFgMEQN5m7eMahgxj0RK6EObv9vbJU7V\nCjuHsfmmSgANnJEO4zy1N8zL0SxO3O5058zAbMz3BxzKQGtn3gMKkOUKX6w7\nDDpVPlg2pRSr1qEHzOZRcNN6oecDM6KA+wX+XnixkB3tX+N6/eDANFauvSgf\n3W/sSWxva3Z+m5Y29/p1S7tBf9PhS2pxX8UcOFoldolwRvw8B5YpR3jrYRl/\n63GsQ3JQaeA9OIVc5zSUcu6Cp9aCnkyfwa2dR7EQ5g7l9hMuHKuHwKJ4kDhS\nKy+JOvmB0T86k1yeZF9rTwPj6GOiO0j+gloch2fvGTH0tUsfsoVgYGwr+cAj\nJqlVw+bZ8toT/ckPlbAYdZGQGqvjzCMmcY84ZpzsMFdwOnsllVKwQDTNIZmK\n0t7I/gO7qijQva6MWNTr8LpH9njRxDX1Fq+0LjDXL0Wtj06O+i2n7rUlphhK\nwtdDtLF86rwdYp9WV3FkSgCLxNWcfiPxJnA5ZHZYjGOKTyhEAHccDgAo4Jed\nIwLcwAGjhJoGh2FIjfnCsCWapE8Iky9gNBhmDyQi5d7g0brRobHDZPRFuB2+\nAHHX\r\n=COii\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/extension","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","engines":{"vscode":"^1.5.0"},"scripts":{"watch":"gulp watch-extension:merge-conflict","compile":"gulp compile-extension:merge-conflict"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","dependencies":{"vscode-nls":"^4.0.0"},"_hasShrinkwrap":false,"readmeFilename":"README.md","devDependencies":{"@types/node":"^12.11.7"},"activationEvents":["*"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.77dcee274b_1583022446020_0.9783524425456511","host":"s3://npm-registry-packages"}},"0.3.0-next.215dda4dd9":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.215dda4dd9","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.215dda4dd9","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"01b829214874ae243fd68af755a6322e51771a90","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.215dda4dd9.tgz","fileCount":12,"integrity":"sha512-NbzZqIVtP5NFqTSk4AoDQMSMNzpzTiNuvvE2TCZ6KoMIhcPA7PnS5reSW7jSXoud3L/Owu01VT2GQUedCL9s8g==","signatures":[{"sig":"MEUCIDCafHX9i/O1G4AxLg01+Y6lNV5ypzZQDlnj1e0TaJBdAiEAiEQe9Vhw5XOLQEssoyG04O5T1vPWAOsjcFYKbIn4nk8=","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":110629,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.4\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJeXFMLCRA9TVsSAnZWagAAB+cP/2tR/qNhZHs6+HUv2kZJ\nUyFd8dqAQ/dDbo1QalzouTA2rZsBcK8VThza4RCePIHdzR+dqJgg2sPNCAam\nNTj7Xk7qY377S+L59R7Tj82IpkTGnLiG43PkaV72i8c+aYhGLgo/ryFinFye\nswQZWbhbbaox/+CxcikRChbfWkcLPHIXDwakWla97Xm4nVaPfJAb/rUq3CUW\nhasiK71zlF22hY2fAevuLQxVL53WGTGfpc3uJZV5/WDpjVkRBkhvwlarzdXD\noTL7IQ/yYl22LcOeeMSrft2Hzrs+VFKvnq8RFxQXRbij4KOk+tlB1TG/12yx\nWEnKLcWMe2zo+oF7BD+autNQpOL7csxRckZtfumgu4WzSEN+SI7E1BcOZ6Ai\n9iZyeowJ7QaUSOyoOkWnf80d7rzKMyKI29QxQZoCsgfp6cbjGHD2QXwxK1Jm\nD/7W0gqcciMCCPSUxZ1ONiCw4XwkTOx0J7dpXLeYcGHfV/B5fbdxPIIT56mK\nXbxf+Sfh5rhhRUMPncwuy9sW+JnhBJ9GSZ9IpU1czu+JVQN+HQgLm69n1jQV\nZDkcKmbZzrXqDg+OmuhDZNdqmgKujn9+qn055RGhtDBspO8CwB8hjzk9yJkL\nO+I7P0MvVgFjmBARdorgM7PZb4dlA3vvCbhOe/PzZZ4W1hTXJKmusKDOihH7\nhY/c\r\n=VWjU\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/extension","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","engines":{"vscode":"^1.5.0"},"scripts":{"watch":"gulp watch-extension:merge-conflict","compile":"gulp compile-extension:merge-conflict"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","dependencies":{"vscode-nls":"^4.0.0"},"_hasShrinkwrap":false,"readmeFilename":"README.md","devDependencies":{"@types/node":"^12.11.7"},"activationEvents":["*"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.215dda4dd9_1583108874871_0.3521705171493865","host":"s3://npm-registry-packages"}},"0.3.0-next.8202955fee":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.8202955fee","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.8202955fee","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"66fba630ed9f8f7d20f822e087264c21625b5385","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.8202955fee.tgz","fileCount":12,"integrity":"sha512-TInoQg9YEelSArZtzvNhMEXMyODUS0ZY7FlbiAm79IgFerxF15+aVrY6vGcrquWDDDjOtSqtUGLIIqqfk6FxUg==","signatures":[{"sig":"MEUCIAvbcYal4kUfIXcX5i0LMi7QpwKjkU+KRYJMP0B4aFqxAiEA9RE4eCI4dk7Q/+Sjvell9KvxFNd6pjw2Od12Nu8P1Co=","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":110629,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.4\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJeYurHCRA9TVsSAnZWagAAOf0P/3s/wrXoa9LNwXJv/3G/\nSykYWIkYWbT/N31UO6Lq0v8HdG2ZVhjJ3msa0rLMygvnhP+mf6w5mVEbMlOH\nu80D1PmJe2coZRd3DyRZA+KfNm1UUJwsYWyh96qVabE315U2XbnZlCc+d3Bt\nZHju/463l1fDGIjC02tb7y5g4m5ATc2rVT+bXlFJdPcerSXKsPNSVmmX2DtM\nahJx4lXhEsmqHlMtlKcHYn1c8cTNzsgZ3DbQ8Weqyk33y9FlGGrnnYWJjt7c\nFLhUqUYhBhKi6DXYgy5z06WTkJ0ehwxFgl+4+BAlhXtqccZyjsSl8d93zp5j\nDhpdRZndkzhLmdu8wvArqnF5yapYySRVGo0cApGZNdLbFC8A3p+/YATA7ssS\nlABRvbV7Tp83LYSAOgL3x79mbSLasEdayKRvPL8sD3TLnmLrww+3NLjoGUvP\n0d/YCK6fEdqbJvwjdHTcrn2/2P9BEuZxCVv3jw6qw6FuDm5BuKt8dlk6m0nZ\nZY+i/AeG1dFK7IIACTEqJqwHOO8Bi/W4AmIgKBokC6IftMLA3GiKgc8Y7mhV\nCO5UDCdPRhUh/iuvXjLrbkY6Qmz47L7PbodTQBWs73l6ooUC7Fav5eatWv9d\nUQ2POufNBAHM26fvmjhMq/qbO5igzMIwEofXVYXh1hx1kuD+bkV84v3UZvis\nWrE/\r\n=S8sI\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/extension","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","engines":{"vscode":"^1.5.0"},"scripts":{"watch":"gulp watch-extension:merge-conflict","compile":"gulp compile-extension:merge-conflict"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","dependencies":{"vscode-nls":"^4.0.0"},"_hasShrinkwrap":false,"readmeFilename":"README.md","devDependencies":{"@types/node":"^12.11.7"},"activationEvents":["*"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.8202955fee_1583540934848_0.14709505144543922","host":"s3://npm-registry-packages"}},"0.3.0-next.6fb14fddac":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.6fb14fddac","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.6fb14fddac","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"7e2a6281a6d8cf17ec79d911ad27ec9079745ee2","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.6fb14fddac.tgz","fileCount":12,"integrity":"sha512-+OcJSUwVQXVs+cjp3peF/5yx3tVw0Wztu243syvTFxkdJ5fnV+d7iU7X/QUhvODsrP3Z5dZ6PE6MURstazWjMw==","signatures":[{"sig":"MEMCIG9KKzkWpE/XOMztTHWo6qofz22J/TaeHM7calud/ebDAh8+wbtEPOdBt4Q7HcwdeHe8PVzMysdbFlCqOkhvgk/S","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":110629,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.4\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJeZDvQCRA9TVsSAnZWagAAcdoP/i6xEjFBdrT8YkhsxpqO\nP8Kne/EvFr27bD3uMgly3RauiH73lsUebyBsqyAM5FWspgHawbZ1crUuHEqo\n+as+xLTcjmoO2dzVRJsx6it+07DAU+vDrCfOxPtE9UKYAk/gm7EDT2U692s7\nKv4BtH5dHHsq42h3mq0JrwJ2LPnbqS7aocT63upHHNjIbwDHSsYeQzjYrFYZ\nu64AFHxdXoaXG8hzJF4GuGDo2b0HrGrdTdcpG1FJBlIhA64EJcy++KtxC7QM\nXU1UsdnmjBWwkgnW9AizInXodDSRSN7pIJ5/DPZAaYmhWwF9Dwqr7IyF1fVs\nKYLpeygXQVvy38j8vJqoczXA4muc5/rMwDOIFUbf4z3w0tNrtiQbvg7B53QT\nbe5oc9emH8FV1hhjQxN/gZ2OseyKX4bbwHXvL/TbLTW7xo8BLp9ag6DX8/Za\nHaRsHIzUyTTSmCBOVizjD6Mwp/NmLcDf+zDQajdBUXeeDbcyrSf/J8Vw02Pd\neloaU8gx0oQoK+LgYx2+s2k6ZFo6yRQgHtyd7y5Gf3S1RRaWijRiF1jc4ZXn\n/gqVcH/COB9URAC4s8Pm2zwiX+C5BWHM2sb5/pNJtgOQKv6x9yHi9DSiutM0\nQmVfhCVVhGrZfBhMeHNSobtFKK/Q1a5490Aqa++yK6S9RNlaF/eRLu+sznsW\nfND7\r\n=P3io\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/extension","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","engines":{"vscode":"^1.5.0"},"scripts":{"watch":"gulp watch-extension:merge-conflict","compile":"gulp compile-extension:merge-conflict"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","dependencies":{"vscode-nls":"^4.0.0"},"_hasShrinkwrap":false,"readmeFilename":"README.md","devDependencies":{"@types/node":"^12.11.7"},"activationEvents":["*"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.6fb14fddac_1583627216155_0.9463881824770721","host":"s3://npm-registry-packages"}},"0.3.0-next.b980d895f7":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.b980d895f7","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.b980d895f7","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"3d6cb62022df8bd172287889778465e5be7d6314","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.b980d895f7.tgz","fileCount":12,"integrity":"sha512-jVGcIGtulIyd8UfipeovRA8GvvAEGKebAzZ+qWPkvJgmNrVknmmeJzz5dYlvwXUQre7Zl2VJ1Ksx4iGSnup/nw==","signatures":[{"sig":"MEUCIQDc5wbYS2N+xMSuNeTZ0vTLfdOAt3tbfT7f6uPUNL3ccAIgEMrRo1EbuWyPahi0tgoDaRLO35pPDZvmFefZ4uPc+aY=","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":110629,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.4\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJeZY3tCRA9TVsSAnZWagAAMngP/0vt/zCbLV2uc08vkhJr\n4wFHjNAPbEBH87VIJbJGQll0VFna0WDXqila4t73Lrh+yXhzwpSmcwnQQSGN\nk6mvxYPWJuMdZZOXf8juoNwuP8rcK/Fwz5Hrt0+aopQAjhkipsr0oU6K45r0\nmSfi26HJ7ACk6VBaO1oSFdTJCOBCfz7Ka6BuS5dWJ5tTXZtiREoFZrHyJp8y\nl31BywaOQTmkoW+04UpzCLzEE2Dc9u2u+TDWkbWHy6KCzP7WZxwOdZG0zgQ/\n9W7cW+qmYo1SnqvS33D5AXvhy/k6a9L1R+r0MeO8Olcxgm75YuvjhR2yopBy\nNUC+glLtuWHKFjvRWzMaz/qwVAtxV3eS0Na0Kf7XzjkcYICA0vCN9M1uwW0h\nQejX4n50I2KgNJt3ix/KE6ixRILvKQikWJJBLd3n3Rbo1xgDJMIdyShV8SJE\nX44WeKeaF81xnZJk/rqkYUD8dy5mjeTDAQxFh78oLjqFXo7LEadwE5aJijjZ\n9CosMM3AIG5R0GrsBCHTT7Ubvpglb1GT0pW5sEwcVymbSrsX0HI2rcwbULwN\n1z2f41tfSmLuQZn93aoxam40nxEuXmRWNX0BM/+zVyCC9EFaCnS0xi/eBa2R\njMN742wYvT5Zgq3rLDmYob13BIHRzNvLMIWozgyjEkK/41MqpqauPJi7Wmrl\nc1h8\r\n=5OJR\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/extension","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","engines":{"vscode":"^1.5.0"},"scripts":{"watch":"gulp watch-extension:merge-conflict","compile":"gulp compile-extension:merge-conflict"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","dependencies":{"vscode-nls":"^4.0.0"},"_hasShrinkwrap":false,"readmeFilename":"README.md","devDependencies":{"@types/node":"^12.11.7"},"activationEvents":["*"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.b980d895f7_1583713772754_0.8428872298655357","host":"s3://npm-registry-packages"}},"0.3.0-next.ffcd280b53":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.ffcd280b53","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.ffcd280b53","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"a18f809e779295f5d11fc7b27643f2130fbbff1f","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.ffcd280b53.tgz","fileCount":12,"integrity":"sha512-UjhF4ixwsFepwOmM3Oj8Nc9QpwatRX9Px8VvRqBB3SUIAjWOrIMQPZ/NTVEoJjGUIbOiID/51TIPYHczm9IQoQ==","signatures":[{"sig":"MEUCIQCci1Z0L3Xmo7Eaou9OitLRt2/9Y5JqKSwlaZJOkk1DQQIgPioAK/W9UGLU3bvuSaVzs1QFCmWUhbF6JfOdAllQSb8=","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":110629,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.4\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJeZt79CRA9TVsSAnZWagAAwjYQAIpSu/zngPklXgPsR5nm\n29HFbw2A2pcYAzDgx6BBze2wVaE2fWR2Wp7XFRkvV4Txrml0vKw+sdPwlIb0\nr1fRkD/WMOYSZPZvkgg+qRzRV7f4OZRnaaWPwwGSqrW5Lltn9WCgfcv9KCYG\nHTTPaCg+8hcgdKWgGDWHY4ynr7hY3WtcPxriJgbiQn1QRJz5zB7Cd9kfYAMc\nKSBdArDuOZHaazKSaI6SLNWXwW46EupvHCyhQ9a7QSH/0OxCXBHtJPaXE2bS\nSMM5mAvuGZWTQgcD1HAXZ8OgCHbcWy6gZ671t8pGqoPkHrys/DyQooyBh28y\nCkiqyIdxBpkhQDLBKm0bjE26qdw8Hs0YB/lBLCpzWHNOTjB18D2gOIYmtKLq\nBhS4+FuxlknMFwxxxSJ++0EcsCeDs6v+fGCvDCZ7003iWCjPfw6/DQ6da33X\nbpmm2gxr94llpJcG0XyoR901Wxhm1iRgyCvt+55S6Te3DuXyqC6mPD5rdwLR\nMFazol5xpisFa83hTkW1lGjXLOG2Z+LYf2/ij1RncpvolGNngCoit5qzzNDT\nYcu+hIyW2QwQnPU/OH75RgqKyHv+Tdrlp4nb8FkSHj2YNS0fCo+/B5q9iJh6\n+8S+c5DHVnMBH7NfT94xrDTU8hjuPmg17ZZK/SzsenSLfApAcm4m6oL1q984\n+7cw\r\n=Dj/L\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/extension","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","engines":{"vscode":"^1.5.0"},"scripts":{"watch":"gulp watch-extension:merge-conflict","compile":"gulp compile-extension:merge-conflict"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","dependencies":{"vscode-nls":"^4.0.0"},"_hasShrinkwrap":false,"readmeFilename":"README.md","devDependencies":{"@types/node":"^12.11.7"},"activationEvents":["*"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.ffcd280b53_1583800061283_0.8823391028753802","host":"s3://npm-registry-packages"}},"0.3.0-next.8c596fbf90":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.8c596fbf90","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.8c596fbf90","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"a17ce90e347e069f4332c2afd0f50da21e776146","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.8c596fbf90.tgz","fileCount":12,"integrity":"sha512-GRQW031k4CfJqltKviqliDL2zwvu0FYOXdSz73LCTfP++nFJNxfzjpSnYHTo5cXe5waZjun/fnroG48LI3t4FQ==","signatures":[{"sig":"MEUCIQCTViP0i0Gbgg5leH8N4je0u5k5dlgo6ebP6V8aPVRvSQIgEYaxwEst19+IvgjfXZsrfxctbTWoCTWp/QPvH2cqacc=","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":110629,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.4\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJeaDENCRA9TVsSAnZWagAA3aAP/iVyb9PHxO8ArKlyPAyd\nP/rDqq7rXX2Rp+I06nStpHFYPitzDOpacHEI+b1DKrVVKl8dqc5T4hRXhI7e\n50LAZjo+jFqRDDIoTGqgODirkWD6PMCeUmEZaa4ls82s1rj8zTu6jH2I40WS\n+mW0Z+L8i1L7FLhFRyE39S8844ESYy6hvUnbH3d2B7h17hKExBLyOeMW+9Ga\nv6u/1HwqJfQaZE6QwBv3WU4UUN1WnfS17kTc+BrgeGph0YMvb9KkDY4kz0v0\nsPJuZ39X49gzV5Lug84QZYUfR1OB3J1adXaByazYrvsikk0ioqR2fLEi/HpR\nuPjbdUOQY1mrh521KLhtA4SN5ZbAwSgq4FfNr7ioUeMV1ecPWCALjeExftko\nG9qq2dly5y2IXk4r1KGj+caYWAF+8QvPhGUo1j7UZy0gKAY1Tna1S39E6hVy\nl7p3gAK7g6SNqDtM2PFBiuhW2EjFGUkcurYU9WSAAidLmDwBt6ThP9S6PnvO\nbuW4WCfeVQqlOz0HqJ1lj27rNNMZhqNDlM3h440SrCijTBK7nGDKVjXawTsn\n9FiffAyuW7btowy8Cb5bg9mZ7RkVlD8v2sFnXyvFiZvELuGmJ2YPS6QPi6Lj\nQQlRwHRtxexiJZfy/kb3GyLdJhS7CYLtPz6Yx2b6YprN4B8mIqztEIPuJbzK\n5Vlv\r\n=FmnF\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/extension","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","engines":{"vscode":"^1.5.0"},"scripts":{"watch":"gulp watch-extension:merge-conflict","compile":"gulp compile-extension:merge-conflict"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","dependencies":{"vscode-nls":"^4.0.0"},"_hasShrinkwrap":false,"readmeFilename":"README.md","devDependencies":{"@types/node":"^12.11.7"},"activationEvents":["*"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.8c596fbf90_1583886604780_0.6059531739656372","host":"s3://npm-registry-packages"}},"0.3.0-next.1df23554b2":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.1df23554b2","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.1df23554b2","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"a1209f47de51449afba1a7d4d23225b903a622c1","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.1df23554b2.tgz","fileCount":12,"integrity":"sha512-K0v/8r+zQXf5YIKGHQRdDW77I7BhLimd2mXZL8SXw6dla3YHYocpSrOmeLoa5Mj9mHqUgvy6wgn4Et3r5JpR2g==","signatures":[{"sig":"MEYCIQCPZ5j5CUZk4I7bNP5fWZrSponGKZBwCG7A9A0LONb0YAIhAPt2m9PrH4SZtEjlqhUFvIOn9aSmAE6cJTM1gTxbrfgb","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":110629,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.4\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJeaYH7CRA9TVsSAnZWagAAPqUP/RqTfGIT7KTxTToVWmqo\nqonRnRMCA7pQziXcLSeovZirZqnGhVAaUMo5DxvvWojYFNxgO1KfDjqbhzth\na9OyYsd9eHsRKHS9IXZILYiMmVFop7PqCBN8ik74rEw44ZxlbukkuDuAUR3j\nOrGhu2oTjtui888vdGUSKANx/3qNZadfo0r4NuYyC8lcCrvg2MTVl386NnkZ\nHft0ayu4Fd42VVtHjPyP1LYLZKIqFdw7RTQbym74X3AYRFvuJRQ+wqIAXf/m\nqSrS2gukat8qfd8lezha0MRprNOJze2nQd4vS+/94JFd1W3+99ZNd0N7UivX\n+rzNdadYyA9DEeiWM0A1AYRdLZ4xzKCI0UXfV0+dDgOTmoae8xV4StaHaQFM\n1WYz9e8Oj5YuyeHbvwzXL7s4p2w5zfZ0pXtpAO5/bLIcLV5ux4J8PCLX68ii\nTEPy77EJ6ilZ0vZOvXAnMvtTSmgn6kb9ar9F9WBXnzdz9MuxgzBYI7CR0c2i\n4NsREJUb901z4yWK5XcZPAmGJIJXtA+NrPjTM0yH1FwMXNvnp+7/dgN9Wbyp\nnspUVCo7MZ2+cwqQuewL7/7IXH2E0+kF8udn65jnFIhZA8aY+L4fpyZeR+Fq\nOsxrF7rAlvhRYVbLwNl/4Ki0qXLCvfI+c4eNvEr5U87f8Ur7RDnQNPdBYC8E\nI2W3\r\n=gXo4\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/extension","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","engines":{"vscode":"^1.5.0"},"scripts":{"watch":"gulp watch-extension:merge-conflict","compile":"gulp compile-extension:merge-conflict"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","dependencies":{"vscode-nls":"^4.0.0"},"_hasShrinkwrap":false,"readmeFilename":"README.md","devDependencies":{"@types/node":"^12.11.7"},"activationEvents":["*"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.1df23554b2_1583972859332_0.17477188275446687","host":"s3://npm-registry-packages"}},"0.3.0-next.9dae408dc3":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.9dae408dc3","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.9dae408dc3","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"be6f5a63b7dabcfc682e8b0e0278a416efb61121","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.9dae408dc3.tgz","fileCount":12,"integrity":"sha512-bDjCRLBtn01d6j0VDnOPimjhxbfgs//2N0+3PNFdcK6Ex23oHUXhBiPm0N4A2X3ZOjIBsaOWVyADSMmrm47pqQ==","signatures":[{"sig":"MEUCID4pXSRX1Lz0gVN+vdmXHLZLR8OuIszQOGxylk5jtWveAiEA4rw/BvvuiXJgoHTPwKezJ7iQ7k22wuLLE0HxNK2r4tY=","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":110629,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.4\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJeatPCCRA9TVsSAnZWagAAuF0P/j6paNw9I7SCRFZRhV6u\nA2rWyA/x7qlXzB2Nk1Dq96KrKK7y21MPJz+F1lIGKmwSSGubzTTt9mwZc1KI\nNkSODGnmn8bd9ni5DNcVqcI43k1akDlcDj/4vKsCLLrxmAB+IDwGqnYsCu90\nitlgknLcyzSJ8Wt+jj5SjlJ6RPEEN8s2XOTmzBwDAH60802oJ9ix6B46Cz4E\nwL9BF4aI0QXeR8vM/jd4KCFwtDBpcdqzdXZWta+Q1wgJbWiMviAXWiMRtBrt\n76orbqFaWAfJxDyoi8KpvtaOlD/xadicaOVpRzMuB9yioQZPSbHxgNtvZTn/\nvhkKkVMA8gCjomfJVyZT677EhHEDLD42BGW9A0AHIKczr/DuQL6eOCk/i7mJ\nNrbMuIT5bkLZlLPFZ/66p4v4Tybsbfo64nZ0UAzsx0HzguJh3fWqbUOvXChf\nUHC7CFZI5LdHtnFihAwNM4I4OwDnQ+g9lGe320z/e4kwHhqGuaa4W1JTmv5/\n2VW/BGh6zY7k9XImBY+ghWmLWAGcvPINTgJ6cyFjSigJgq0Ob53Ro8gkKDfm\nV1AoQFP0x0LbTMDK9EUs6cULIVdQwsK/+NKXiYGPL31j0glRz9oVU5WBcbt+\n6LzqDAeMT9n6l9EpBgDau2Arf3+E5cWMP4qtIrWxyKQ7fJR/i7x5dpG+xHIx\nFc37\r\n=gJY3\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/extension","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","engines":{"vscode":"^1.5.0"},"scripts":{"watch":"gulp watch-extension:merge-conflict","compile":"gulp compile-extension:merge-conflict"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","dependencies":{"vscode-nls":"^4.0.0"},"_hasShrinkwrap":false,"readmeFilename":"README.md","devDependencies":{"@types/node":"^12.11.7"},"activationEvents":["*"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.9dae408dc3_1584059329674_0.8263118985370146","host":"s3://npm-registry-packages"}},"0.3.0-next.ce55064873":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.ce55064873","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.ce55064873","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"006911a57c74ecc07ed093028795757ba3a1a46f","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.ce55064873.tgz","fileCount":12,"integrity":"sha512-s2uuXObAmL54NSncnTP1GwMAuHYUgi+XFui0cBhKSf4Jo1OnvZCsSqWc9rFo0mZ8vSisbkugYytRlHFVaP6waw==","signatures":[{"sig":"MEQCIEAxp+nOajTKPQYT6Fo6C8VzV0I1Ia7zYtcfHXI0ddBXAiBaz9pbIS+iNiVHmJg2q2bjYz9EY05JTN+dydzYPMGWCA==","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":110629,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.4\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJebCVXCRA9TVsSAnZWagAA4JAQAIawWsO4HEs/faWbfyjx\ng46XNNL54iX0TFoHlKRg91LevZI9itFyrwjREpCyDCnZ7XdD/WREF8355Eyp\n8yJ2vkqzbmU2olJSBhdoAuLZTc2JIChjtoXZGnbvSRMCJtVAhBkPjLZt8vWy\ncpGb4OPY2IvjykVa27v7flcQF/Xu2Y91q0/d+PPa4zQm/PC5jDe3+1i3Cik3\nHnNoq2WykGiV44R0kC7ikbTTJgB64U0YnWF9NXZJ/yAq3BgXByE7+6NOvRc9\n5AoAwTqgFUiybs6ah4IIhxYIPwAU6W8R2t+78x1NWVsNT9UyS0MVLSTbUg1N\nHoYUVOiKw6JKV51YvuPDAOtZM1+XfT88mwS8EoVT0W3hAcc7pp8mfIB42vZ3\nbnJvIGh/HJC+BqtzfTRhMrsZXJIBTv0wszRTLFsxsk4hyzluMobTKcZWnsln\nlRO6wkvfRa5UEyzsGYDKoFfKbbD8I6brOH5SPPv5K83Vqs7BJgwR7p5KXUuG\ngwx0LVnkPnti5aNdk4aE3RqaCz4bQf2GMMEuPAfvAJD7oPugFaqMGCT/6hDB\nT0P3Q445kLtebWY32OSSW7jpwFOAhJZCZkcf27j2RRbejUgKsxyJuhCiLSGH\ngSAhqlQd36x2B5MsfB3WSdN8xtc1uT1+wJu8xDOCor/sw3zsJl20s+vvfNtf\nfr8V\r\n=roiN\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/extension","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","engines":{"vscode":"^1.5.0"},"scripts":{"watch":"gulp watch-extension:merge-conflict","compile":"gulp compile-extension:merge-conflict"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","dependencies":{"vscode-nls":"^4.0.0"},"_hasShrinkwrap":false,"readmeFilename":"README.md","devDependencies":{"@types/node":"^12.11.7"},"activationEvents":["*"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.ce55064873_1584145751376_0.6392809781720628","host":"s3://npm-registry-packages"}},"0.3.0-next.839383dc1d":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.839383dc1d","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.839383dc1d","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"ce9b548832152e9aedfa26244d8630b0aa941714","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.839383dc1d.tgz","fileCount":12,"integrity":"sha512-eevuoo7EWF09dA1cSmY+mjTcUx+pvB6wLYmDcSgwbF4ApNXl8cxkP2I/GYgBDp6ij8NY48m0pDELpa+q6oQrPQ==","signatures":[{"sig":"MEUCIQCX8s1rnQqgXtJkiTZyIeS2qWRt7+e/ZmqxLAc2W1hTDgIgeHyqsmTfpCk+yed0KDCl20bmEPQAFscuQLNEFAO0JMw=","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":110629,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.4\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJebXaJCRA9TVsSAnZWagAAR6gP/0spi8TNyGqt/pqs90Qc\niS61V8AbFv4Imcw9wuyv/Dkeo6xfvw2iBwpo+FXDymFpxo9tEl1917d/YFcn\ni1tRgX0rjIPNV/Sd/apWmEJMqrw0+5qcn/EXvmd6W90W9p6k4VipI3HX1D36\nUCM3pgeudyiTHQ13jruLZpXWcIIU0+lXvmy8FrBSRs3FYYEJ8tWxk0iKIyGh\nzRQbC7BySox4MrTM1Vol85GOfryfwy15vy4E9q3TXX0jXh1YIAiUlY4/RqlT\nG7ws1bvB/n6s0y5ElEG2rfI5NEx5N/m65X6nriHSuiMpfRSBpMwloGcVxHok\nL8K3s1S+rRLO06Wa5QeSQ5+U68h4FZDfiqNOIdMol2Mw6U0OJTXoNFIZRjPS\nDxA4A+B9T6fa/E2J24iVqvWWVIEfkae4mC3z1ZDgZDOl0DGasCFt4TfZ6NFG\nak++SqSTWCgnebPLC9m3HfAsAwO5CLhqMZ92tMN7pufn3y+Chj0d0GjBK8BC\nGJ6i7+KXuS73qkeDHCw3wqdJLFmaXDweVzV+zO39aho7nMbEMfytKIqBXAls\nznUkT6J+6YfLvcsAwdGSlRuqSGwmla1CE5KlbGwSRCvWsIHz9GwJfm4YbKq+\naL0LK2TDYF2ZNX162zyK8BgCd/lT0OrlOhBcoFHJdMwITTdp8gkDWkJ22gq2\nxJ/E\r\n=N9L9\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/extension","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","engines":{"vscode":"^1.5.0"},"scripts":{"watch":"gulp watch-extension:merge-conflict","compile":"gulp compile-extension:merge-conflict"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","dependencies":{"vscode-nls":"^4.0.0"},"_hasShrinkwrap":false,"readmeFilename":"README.md","devDependencies":{"@types/node":"^12.11.7"},"activationEvents":["*"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.839383dc1d_1584232072891_0.48697766446894564","host":"s3://npm-registry-packages"}},"0.3.0-next.078b57357e":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.078b57357e","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.078b57357e","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"a51d825eac80aed0415687abac4a114ad570f548","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.078b57357e.tgz","fileCount":12,"integrity":"sha512-NG6cRFGt5/iZn72BHzrl0GSCn7h13ZuWDzc9yUwgahdE9xjSekPagFxhrk/pybhjsqyvIGA/8IwE8xhF0SYg0g==","signatures":[{"sig":"MEUCIH6lhbUsDaQCP9N3Ey9Re0+S+aZBku4wnEgjnuHLwOnRAiEA4PwJ3PhIlnVlIvGbilo///gZsyNZzKcJuDQmW7VVBrs=","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":110629,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.4\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJebsf6CRA9TVsSAnZWagAAGSEP/ilaWP99ARmlDLRxLjWu\n5JGuTeSGu5VFFRumj4WR6nVJ3nHCgDEK3hVzTzHEBHdXyHID0t90ldgWJBAU\nlnD6h41Jf8S8Um+tkLWcDE4vYelVtt7rgspxstz/Crosb2yCP4CI1CkzoOGy\nKhIb3zevuCH9JJhJeXHV8RUe9C/waxIo985GM9PuP+zNaZ+4hh0yXAxqKQBd\n7VZs9chFI4RcGPUGv0y/DzE+uRFlbPnFFBY0lVtRUGM7B08Q01Enk2810xjD\nSP855MfFbMEWGnhgr2WbazmUPsWylWD75A3U+QYmpuFMvIo3n+4+CkJelIT8\nBLkaLFRM7Kbvv3HoWfG5/ySXOKy3beg9cHpU++hL1CUussQKWPTP+ZdEsP6x\nlnAUoKhAKPB4GFK4vQRRQOyZA0ry8MI5N2trJ2lHOxCYcJJ8zbF3KjuXMCSu\nVS8Pld20X3qIwKZ8uAwSJ+hf4tuoa4lBJVGBWr3gWkhjIsQXsIPyIZxOfOiR\nEg6Cpea3RXg/7vcnXrdYXHq6wBKrKY1Zz1hrFMd2LtDi8pn+E8aKFAg7Si4d\nO+vCyRciYXz0AfwCD8JvqIIlt+VJxQ5r3KTDc4DwmgK20VsemsepZbb3tlJf\n8W0YI/FeZmcM6rrKlHRIxQwkfg/F741aAHPcgWViMo32f3HWNvn1rDc8872f\nprRZ\r\n=eA7z\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/extension","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","engines":{"vscode":"^1.5.0"},"scripts":{"watch":"gulp watch-extension:merge-conflict","compile":"gulp compile-extension:merge-conflict"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","dependencies":{"vscode-nls":"^4.0.0"},"_hasShrinkwrap":false,"readmeFilename":"README.md","devDependencies":{"@types/node":"^12.11.7"},"activationEvents":["*"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.078b57357e_1584318457946_0.10056070996155309","host":"s3://npm-registry-packages"}},"0.3.0-next.099a7622e6":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.099a7622e6","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.099a7622e6","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"aee712fa633382c7f278efa795299079144dfdd5","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.099a7622e6.tgz","fileCount":12,"integrity":"sha512-pdVW1Ul/g47gplLqJiU46M3vmnU6LP313zTBDJtCKpPUXGpynBzz3gKYqrRwyLI9jW3mPfaRwkRKaGDyT0OBbw==","signatures":[{"sig":"MEQCIFVikvVYtO+9nC5l5m5+i3wVEuJHtmBTcxWxFYXUNfK2AiBD7E/NNe0nnwWYxiAzu+4WpF1SCGdrFck5eTu5Yswfhw==","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":110629,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.4\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJecBnECRA9TVsSAnZWagAAIqMP/jRY8GJRvyzLNAPYgnJx\nN28HPVlPfC92rMhAP9aVyi+o7H9//V1bhPTMbB7OGjk7xfgXxpz94iUAefSF\ny/zqZidYSLSj+z8GTPzkjvoGvAbMDH9E28XtIiGfnFaH9RNwa3CI+zMbcCRs\nAcgkyIazIXlRoCzX/AHeqLS4THgauDtAMkBI5DSs7r5xzixpDyeXDNEHCHCY\nGqlpFxbaCsEAJ8q78iF1C+wPSPvwUebebwNB9envNDkOhmqy5ZJ2dee6jWXE\nHY5Y6eeEHJUXKYrPwpYpNJ3BGVxH6mAOVkx7WFKL2LqXj+AcIdWkBjEKS6Y4\nni272fBPpppyGKu7zQFsYbsgAuTIeU6HB+PgvrC2pMepQtcOXPaaJnPjw/ZH\njYEIbr+3qxe/jx7TCk6ViLohXdBLDe6oFuM6dq94nJZO1AUjdntisE9UVXur\ngVWAa5bFnqGhqgJTrlPaKeSV2euODiWBTGmYxhi27OHeV2WQG5zay2w40VxD\nhfwWjMfBJ6NJ+jyJx5D/602wC6vcjt01ZIwJamxDyCA7hrAadSrH6/EzeeKJ\nS85tTlNO/C86YntC18gYzBIxRyOc1/yGcfACMsePKe5B3DwtE7K62ySCmPOb\noB9Ltd2d10F13ok9KIinAmcEy0TTZB7wiryYm4A8sg6puFX3dzX4TKflGMbX\nSe8B\r\n=y1G2\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/extension","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","engines":{"vscode":"^1.5.0"},"scripts":{"watch":"gulp watch-extension:merge-conflict","compile":"gulp compile-extension:merge-conflict"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","dependencies":{"vscode-nls":"^4.0.0"},"_hasShrinkwrap":false,"readmeFilename":"README.md","devDependencies":{"@types/node":"^12.11.7"},"activationEvents":["*"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.099a7622e6_1584404932059_0.7431745402803325","host":"s3://npm-registry-packages"}},"0.3.0-next.a8e13f1c84":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.a8e13f1c84","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.a8e13f1c84","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"dad93d19b2b2b294c2127740bf52f40e1698de26","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.a8e13f1c84.tgz","fileCount":12,"integrity":"sha512-649wirQ98b5S4+TvuPAuXjPC0iDH6kK0m36mrCF5jZHudpl00uvT5KzK+0FOrmb2ZNMrI70y5pAD8kbYqfslpQ==","signatures":[{"sig":"MEUCIQCclm+AVL7I8jEY+uDWqGcyNqfn4NpPQeKLLj8h8LpNWgIgFmAjQQDI32+atnJTaJedxNeMr94zBPmHNVFisBF7c9E=","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":110629,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.4\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJecfcYCRA9TVsSAnZWagAAkUoQAKFz1MnZ5AdUH0I1xYyU\nl5mPPTcKQwaC6lrGUd9eY28oyiDdLZZZpg8lwo427mMku5We6dvkSSTeMWO3\nnDO+MxFcHKuodg4zWxUj6oJbTJaqBUeiXkFslR25UVFoh3iTJ6D0mI2z6qDC\nPXsrPX7b3EmKDAO3XNHtJ0dx5qzKMAAW6TwwnYcz6K08fjESr/hscct17aYu\nXNuuU483dRYtOtGQ5nDmO1RxnH5146TdVDFALmhmixdYyPP/yIR2feWnlC4N\nF5lfVUQzlYbciOPxcJBH6qICb78HVRC2TJc5Jyt8SfsFvf5vWQikmEYNbmzd\nbVuon7iZ0dsB2IoU8KVdgoQC2bQxklPHNXkJrLsb7Xas4m/XaeAREkdmXuEo\nIZEk0VQvIHwJtn/W7RFi3gd6GnCjdAlDYt+RHKJBrtx0mrIatxlVwuBnAg4b\nFyRBiu8plqOeYZGtA0elyTuACvmDWxPCF+Z+yawQgBH6tElz7vunXH6gMgGC\nSrp04kvxTFSdY6K//4k+xnT1BQQiFPVb5ym+5VsJTSFsQKXvwssK2BaWedrt\n46c5UHTo9YALjdziCQmKRKh+0Yu098vInsGhnuvQLumqJurmJ8jeWg465/OJ\ndawbSrFs6/uM7e3SO/E44Oad4myC1rFUrl7GB0p5ny1jK2qdgYbpyth0aEHa\naNhi\r\n=KFdU\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/extension","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","engines":{"vscode":"^1.5.0"},"scripts":{"watch":"gulp watch-extension:merge-conflict","compile":"gulp compile-extension:merge-conflict"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","dependencies":{"vscode-nls":"^4.0.0"},"_hasShrinkwrap":false,"readmeFilename":"README.md","devDependencies":{"@types/node":"^12.11.7"},"activationEvents":["*"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.a8e13f1c84_1584527127747_0.5703113073319255","host":"s3://npm-registry-packages"}},"0.3.0-next.902db3ed0c":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.902db3ed0c","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.902db3ed0c","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"55d0a3eb954e19cf13f381fa338eb5b79df28ffd","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.902db3ed0c.tgz","fileCount":12,"integrity":"sha512-zVOIb3qZ+kecy9j7ih4FF65gGEbw18g5zgExp2OW1owDH0gDPrCjT4AJS70V+weaXezlFginTK2qrgDe2/eo6A==","signatures":[{"sig":"MEYCIQC0h8EsrUNasc1K3DmX2zUCaRqYHRP8vUoLk3/j4OxxMwIhAKoCyhKBt5EzLZkAJTBKyeTvf13qORwhQMqRVxXh+CI2","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":110629,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.4\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJecrygCRA9TVsSAnZWagAABpIP/RRdp1vOPoHhTAV7bOGu\n7DwdzexmGXTleLvEUWYypGGSaSZl+uMonMSSyb/5IxXCuI0/823WC+7hbgrf\nqp2qbSCJdIM4fMaKk4rJK+5stmWWFtXCww96rYDAl4WSHT2yVx2kN1aCaeaX\ngEgcr2ixarRrtGeMsrKIh/8Ok6GUBCh5GMXgCnlSnn0VoRwkrv8C+XFReiaJ\nNpEXK3MnvsUetNJ72dR3fwVVeRSOvxN/dxPEEewbTDtHTfzaGOr3umaCpHgi\nDn8WrDE/UD1+irBRnurj6/3Jo5uI8rGKksELRZB0wdEWo+nnvbkNqROn7vt4\nMAIHMypd5dZiHiSp2kpNtw2SpuLFvkUGak19eI5shgbYbgTn1oBJfpDnQLh7\n/oYEc/3tpqFlIzSTfKeUuSm+1CX4CZuMpNv6QT/Ksq3cOaR9FKFTKjnbTw0q\nLzRw0ofOUwKcxmSRyhFGb1r1okWXtFvjKh9iMBfmCiJ1mD5E7ejJQPP973UO\nDpubUwlHQjf6454zyLSf/PtEsjf+qqnxlcOt3ZDoIWqDlySqnC8pNEuZSsgO\npCOEu+k2nnZ5wi1xWeAqAg3H0y20jiCSHW5D4NUMKlJq4nXwa+D7/nwRLU1U\n1Hqdlc1spw3Mk89S9rspynG8QReAwM5ID0cAZyBDFqJwg+LGNZ4XSl/otuZa\nLzWE\r\n=zga/\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/extension","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","engines":{"vscode":"^1.5.0"},"scripts":{"watch":"gulp watch-extension:merge-conflict","compile":"gulp compile-extension:merge-conflict"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","dependencies":{"vscode-nls":"^4.0.0"},"_hasShrinkwrap":false,"readmeFilename":"README.md","devDependencies":{"@types/node":"^12.11.7"},"activationEvents":["*"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.902db3ed0c_1584577695621_0.5327056970837858","host":"s3://npm-registry-packages"}},"0.3.0-next.56660bef36":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.56660bef36","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.56660bef36","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"0f131bdb91ceae9f8085b06dc1fea7a457622be6","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.56660bef36.tgz","fileCount":12,"integrity":"sha512-fFPXkrjpjVOGDcPrCpyjHBeaB3JFsMJXenqSltpo+icReTKHB+7Ur95iBu/+rsledW13FVOeM/RgSyb6qCbGRw==","signatures":[{"sig":"MEUCIQDMU7onKvwsp5GUEwYzAHthU3yYeMfwKyO1E3pbQi/OfwIgFLLg0wSMdpQkfxRzOXRijYp/GRZfWed3Ancflu0zueo=","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":110629,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.4\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJec9HxCRA9TVsSAnZWagAAIRQP/Rp9lr2KKdVEQStp9Poy\nSFOwTOhPYyx7x8kYLAuiPrBCC89bMJ1OJwd8sPU58zVZ7GT797KTNo3zapB0\naPdv3PPYnjVP/SQiPN8Yi7Z0pEjlZedX60mndK5EP1OMQ45+kTsjBvoP7pVa\nkgGNPoxfOvKlGJUUNqQg/bZch1RyWX5eJ3rw3KcomL7xcBXjH3msPMjK01Hx\nrseBwzAsp3XCTjn+EViG5uf2G1ZRXReZtbXfvAdAjY6JHjOTxGrLZ2lH9E0Z\n/rdyUZ9Vk2R7+50oABvWz8aod2N9SJfPYzrwl8AInTdY+jt/p8z2DnKMuW+3\nQ4ezsx66x0ZQJR8j1dg7H7kz55Mr2TLex/9Cr/KtxDJVEvk2rUQUL08hqGti\nsW29Cp7td0lcpon2IE61EvPDqpf65WxL/HnDJKCLy8y3DutC3eiqVOuy7Ili\nSl9qrAiWgC6JKw+KSGiAaU7nJ+ByntL5dyJ8kpjsBoJyKOmHfSjlp/W1gso2\n38tzU04Y+ZvPHZZ5t6+6QxYGVfdCxfkAjq8ijuaz50i84v9ycS/x7kBgMe1C\n0yQsqp1wsik6kfcJlMkpaG3/Dr7V4xYXXqa6uXvUKSZwCkRBu1RRyahdjQXQ\nUatnNEmBi3f2a9eGRZ+z0IXHKaoPKLyChjVmRO9P9/qnxQ5sSpY0zssbP2IP\nSbtk\r\n=0Ks3\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/extension","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","engines":{"vscode":"^1.5.0"},"scripts":{"watch":"gulp watch-extension:merge-conflict","compile":"gulp compile-extension:merge-conflict"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","dependencies":{"vscode-nls":"^4.0.0"},"_hasShrinkwrap":false,"readmeFilename":"README.md","devDependencies":{"@types/node":"^12.11.7"},"activationEvents":["*"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.56660bef36_1584648689091_0.0699289227481501","host":"s3://npm-registry-packages"}},"0.3.0-next.a67cde209b":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.a67cde209b","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.a67cde209b","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"4ca4d79a95c5cd2f4e5531a6212c3fc6d54d15aa","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.a67cde209b.tgz","fileCount":12,"integrity":"sha512-RbYuF1DaKtnR0FJPREmynEiiMS7xHx5bkbesfES44VnDQ/r8a6YJcmYNSAmyYtIZ5zfMeRYmvk1AvER9iZ7osQ==","signatures":[{"sig":"MEQCIADY4NwASaAEk+uBZWOTw794/kiWPj6/MLrdwvMiZoqLAiAz3/c+bk2vJZd8ThsMU7jElzr8RfvX9SkTxPKF2YuAww==","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":110629,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.4\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJedA5LCRA9TVsSAnZWagAAA9IP/Az2rEhvHfu3C3uzPAgf\n4dUy1RQ7mSZ/5UXos5YUmRl4+J8qEINfxMWx73LUro4H803am/p5haF1Ydyc\nNDvPhcOU/6u1ySGEmN0yMp9W6rCwVNEjTNgPsMd9TeRhqRNHen9cp4Mm7ln5\npjqJlUPkEK4Af75EgBJ3HSWg1/HQI8EQ5T4C40r9XVLJgWCzPuOhnOSA/jlG\nLjIUvT2UlNBVQgLNM4sJl+9QcXyplZFhmqrw6Tku+TpULxWMu3jqzKLepGNl\ngsQuN5M/HkLQgOSKkzPT3xZbAKluW+BQ2CZH/6eCQ1wyGpgZcP6PvpDyH7lj\nJP4jYFNqP9VgnoNNBVdL5JRE0ZLpyKvOtLyAe+Q2Kc6WWCGyqvJ6BsIJy92S\n/3O4OV3COu/Ou8c6VhafTzRMP7rhnsr5eru21O7aV07dF9Gd9aNnEEqnTMAg\n/6cYOElEEcoulMn+W0V3o6NLugPZ2XGAsdKLoMKywWwAXs7gzlXwcm9mF1gg\nB1hPGZIqbWfREjMl5AwxMVntLnd3JwwqHjuoZp/6dFno7PAO8JUbRFLwuYlw\nkB0abcqxJxbZmSi5pAcb70pHBx2ehCOWQFwmIbeGqpOdKr6E9w3nS10l+aLI\ngDRqyh5T0SZnnpv6oI/ilV1fvdWg3XyKNIxb1LGl65yF/c08lQ7SB2Vb1tM+\nf4yh\r\n=HxLU\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/extension","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","engines":{"vscode":"^1.5.0"},"scripts":{"watch":"gulp watch-extension:merge-conflict","compile":"gulp compile-extension:merge-conflict"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","dependencies":{"vscode-nls":"^4.0.0"},"_hasShrinkwrap":false,"readmeFilename":"README.md","devDependencies":{"@types/node":"^12.11.7"},"activationEvents":["*"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.a67cde209b_1584664138178_0.8299331187037502","host":"s3://npm-registry-packages"}},"0.3.0-next.10a7941854":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.10a7941854","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.10a7941854","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"6bc67d4490acc1b136834c078eee04f25750a6b8","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.10a7941854.tgz","fileCount":11,"integrity":"sha512-CmYmFW33LFWCHIgsLP+/TiWgiNA4jYjcJzLPk4GI6haNCHOLb+Mw7PFFERF4N6WC/VPqG8GmmQWyBlzmGDZWxQ==","signatures":[{"sig":"MEQCICybRobVfoCi5+6hmW2wKY5ifPLnonH1MtpB8fJO4SVtAiBx7GFeAjVBDRvJJlekdDWZ2VJEWx0NOPL32q3U1ZkjjA==","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":110343,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.4\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJedRGhCRA9TVsSAnZWagAASrcP/09+nUzGrXV+YL6dfjlZ\n6SWuLnxxI/z29ePZ/f2MGSf0wuP8eLKgIJGzLTgqchOQAB99gJBU0SEDqFdQ\nHjcAu3vz8XIhzsgzP/pTym23E48CbZgGqwJ2wz2Aa3kHmhm72t4JLAevW0Y3\nAwejSqIizErMCqBd+ULQhSNC6HR/ORh0TH6CAjQN3QhCJTc2xH6d7t+k40qD\nwSU4D3pqDBd5kZSd18ohgnThEEHMzAosoappPJrOaaRv3FaYJDM2N77PHx69\nqDQD+bGNtEJA49Ew2IGZyivLt1FA3Y8y0mWOhukKVk7ZTp1PdRh8vLX6ESfG\nAQGcJmlSp1BDVoN3ECRIsXB5kBiMe31rlKLrnzNTCD6bFrudMYMcc8FWEW5n\nEhYWkeWIiRvOkDP9+gIQGJnK5lydH8GOhVoIwTbYvuXWVCxXBdNbIrg7V5PE\nZCeQvTM250hqFcrrPPh3UR+2aLiNQhwiJW3G6hp84suNuvUt8rvPXVjikosE\n+bu66TkUR0rz7b0/nO4BaMnaMO7IqQwCs0JOiinJ1fgPC4lECdRWZDBTxSpO\nfFfujDIt2aNMYTDUH9TEMSGSlbwzuyu8OSeibuekk0JUZ7JhVLDqDWTuBA5v\nKuHcDUYTQuz4RtbZfc/DOL+vah4OvV0zpa2cGDNx/2dm6+6CawfWnHvpw+7L\ntIzM\r\n=bSYF\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/extension","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","engines":{"vscode":"^1.5.0"},"scripts":{"watch":"gulp watch-extension:merge-conflict","compile":"gulp compile-extension:merge-conflict"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","dependencies":{"vscode-nls":"^4.0.0"},"_hasShrinkwrap":false,"devDependencies":{"@types/node":"^12.11.7"},"activationEvents":["*"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.10a7941854_1584730528510_0.7204340078534697","host":"s3://npm-registry-packages"}},"0.3.0-next.2d03b83b60":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.2d03b83b60","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.2d03b83b60","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"2cf171a5eb122c61a6fb4d4be6ceb24daa36f8cc","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.2d03b83b60.tgz","fileCount":11,"integrity":"sha512-oij26GtnbyurTU4dR09H5NcJRfClCbmUEqJgBFYKZE7SvtPBeqQQGo4Y2VrzBODa0FTl1FgbbUJdNrYCvHKpxw==","signatures":[{"sig":"MEUCIDGicqHKVD2YBi+MLwn7DgnLayl0kL59hTNbIGvPJrhPAiEAmB+eh5j+s8GpSASOBhzMbVp4Yk6kUtPk0/DX7nZguFA=","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":110343,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.4\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJedV7bCRA9TVsSAnZWagAASkQQAILOMCaHEs4+lcTjl8rt\n5otEdvdFcDe1raMYdSpw2i59a3ZycXeoK+Xbza2UtRXYy5JlEGhMBanX9wZq\nFPIjnwfJEGOTeObI/nyLMSjw/fwJUMmP8X5pGIiB+L+dguQL62AcVhFOFZ1n\n7o1GM7fdGnvaDpWQjlJq1A3mDd1s2Po4pjiEOKr+gzlLAahTtylBWSCEhJkM\nhCJYAK2yMMHRYYxkqplQ7e1rTgqe7yfK4VyfjdY3HA9fWm5uoAhVUGvqUpPs\nhAWMRnBr9H0ggn7+hxxDnqd2pJhRykq96X6mV4swSRFQGcu1f/XVdDiKhCYN\n2SQ64hph6MiVLIEzP5wA1pkaNjx/4iWmvWEu4Yfj9WTNXf5xCo4l8AMX/57u\nr9eOqKGjCs5+paB3TIWwjkou+YizBGsLfipPXtdUs00Lpk8KfT1Osl9bI6bE\nWIVGqWIXK2WUdVpcmYBvcxUfRJaq9TtS+vRJuXkwr1nAjGrB8agLp1Vz8yNA\nmV3iWWZflcIgwrl2HDz14opXAnh4VwRSM2wdlzkEfTYndpfQJZz1/97IAnjo\nJa8SWapLg5I9+5bSSAvmzU7QDe2GedR2Ve/frVLHHfRE5qQSRgYUsLOWYiUk\nIjAcXHfHn9Td/orLelE6ZQR52sgEknAEFyZwntJQbPyxnYyHi7xf/DWs1x7I\nVPWb\r\n=PfJu\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/extension","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","engines":{"vscode":"^1.5.0"},"scripts":{"watch":"gulp watch-extension:merge-conflict","compile":"gulp compile-extension:merge-conflict"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","dependencies":{"vscode-nls":"^4.0.0"},"_hasShrinkwrap":false,"devDependencies":{"@types/node":"^12.11.7"},"activationEvents":["*"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.2d03b83b60_1584750298486_0.21097759990650755","host":"s3://npm-registry-packages"}},"0.3.0-next.5712574281":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.5712574281","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.5712574281","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"bd8fdcc6820da6046aed75fa8096202093c0a1d4","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.5712574281.tgz","fileCount":11,"integrity":"sha512-oEAMwtdcQcWCe/2g6Y+DJQJ9xuMMM/wuWKzTTB0bVnxgqAud3puw+lcxMhc91tVNibEWWjBKOd1StReDijjuFQ==","signatures":[{"sig":"MEUCIQCeKJd1qIIpVDmOqq1WErIQMc/AROGCqoomJANpkt6aEwIgSa3g9dugvK05TECRYDPsOnHeZztiCgpz3+O+fyRZ+Ko=","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":110343,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.4\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJedrAoCRA9TVsSAnZWagAAx7YP/2BwMGjMb5muS+mwlYig\nn9VXAnv9THrNfRoCxHMmmaai9LgApAVzUnHciP89eoRGHUwiG6q3ApDhISL7\nPpOgyvt2lUBpBktHcf1Rk6oPz/uZIuIHSqX394RtpOjg3lqqwqvgbj8sofF/\nvTJ7fKscDoTFfyo2NOzJNjSxoQEkTLz08Ou1EVkmABuDpxf1XdghSeX0wa67\nJT6VGIzS3RCLuggfVK/EytH/rhyDhFAy9zEaK/gd0x4na/Pi8A/rO4TOGZxt\nqgWOg74EytqBnDIgmElM6YlhONJmoCDFmQmVq6ow8SCE0rNoVlU/NzTzBKGS\nUGmp2sQ6tchV28RDJBEe2RPB0GToLZTAb/JEU3nrMbszy16V9wtaWTad6u5l\ngaTPt8P/2AYa7digObuN6Mv9fW+i0an8WOYw4+iUPmXTN/ISFAnNW6q/E04m\nbTCu0ZD+HmPkweVNuyA6zBY2AzehkNGljJ89nDvAHF8Vs4QTLXUGG4fXC9b6\niqTjVZmkqjKz+l9BprBoz6Mz8Ija9SEFfxUMkFCPta3z9MfxEWkikoeNLlvT\nxsgfKUWHZkoJTc4iVWR621RmZlcJewTVaFzlDWsd/dHnr4/qByCx/3/X0ge2\nydiDf9spm/tub8MY9Qp4WJUOQh2sAfvN82efWCOt2FCwpKymzuQtWdDMz33y\nMJ19\r\n=ZHaS\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/extension","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","engines":{"vscode":"^1.5.0"},"scripts":{"watch":"gulp watch-extension:merge-conflict","compile":"gulp compile-extension:merge-conflict"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","dependencies":{"vscode-nls":"^4.0.0"},"_hasShrinkwrap":false,"devDependencies":{"@types/node":"^12.11.7"},"activationEvents":["*"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.5712574281_1584836648312_0.8036647654972757","host":"s3://npm-registry-packages"}},"0.3.0-next.53054c23b5":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.53054c23b5","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.53054c23b5","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"fedfca5a0fd84aff3c62e86e0f986798458a1eb1","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.53054c23b5.tgz","fileCount":11,"integrity":"sha512-ijz/Bk7kAUtfPMPi18tNqUCxs49kh5kLTPscCT/vlmJGdpXpJOAhdf3O+62vId7nEnPL/8bq+RZKff7x0pl/Eg==","signatures":[{"sig":"MEUCIQD+ZJTIPmXS0kmAR0wIpjEYqa+hzy6RvyCTjfGdqGh7FgIgbcgTsSrcn2794oAmPzC06Xu7mEipmzXId+74zRBN9dk=","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":110343,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.4\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJeeVN6CRA9TVsSAnZWagAAc+gP/23rONtcO+m54RATgy5e\nle4O1lmzCdzoa6KAHmNlazeRxJtU5xT3mUgunNwh2bnk5HZ61XLSJbtc2Zx5\nyGMaWoG1xp5cAgdRkZj/wSBg8//nOoNqIwcwWmM5lyutrhp3aceVqCqt1eLG\n9cX1e1lWsvDNCn6d2RENgbdsZw2cdHSSUdOOD5qAewxJ/L3XwIIEiO7aPyUJ\nVy6ef5ZDUQ4ZLNEpr5oJWEAA8YXtiEzQr2P1Q8zpx9+d4K6pHegb9SD/sYTr\nPmMkQhI8oZ7OYqqVzcM19oWH9FPFaYHnqUa29mCKukuHP7e3CLqMGszS+QxO\nbRbKswFWuuLap/4mrR/P8PdEE5lKCCkjta6Y879netEgQkF4VrMG8rdh0D3/\n7OCOjHgeDn9dYJiZW18b+sy2s99GXQfAF24on6xMI2epi3THqHDHr3CSP/wM\nRr1ChUGvCiy0NbnfBNIaYfJm8WHzmW5gQOa5/qoJA8Nr9KodrlR9N8BaSr5M\npCwAouxWKFjoCn2XOOj4I5TQoQIoosb5VKB/imd0sftNuNkmyOezYcpqXGjP\nWGtf96qYoCMK7VhcYPZrgtYuoWjOpprpoUgHH4oeinVzEv/3Nqj+EIUJR3Zt\nna0tL8D3kfN/AmIbDS/jLv2HZWaa54l6l68tBe+tC1RcB3xogMGPwmWTXKGs\n2UOe\r\n=GoUD\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/extension","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","engines":{"vscode":"^1.5.0"},"scripts":{"watch":"gulp watch-extension:merge-conflict","compile":"gulp compile-extension:merge-conflict"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","dependencies":{"vscode-nls":"^4.0.0"},"_hasShrinkwrap":false,"devDependencies":{"@types/node":"^12.11.7"},"activationEvents":["*"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.53054c23b5_1585009529787_0.19414881919809202","host":"s3://npm-registry-packages"}},"0.3.0-next.906729f142":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.906729f142","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.906729f142","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"2517831cb28f51751f4cc33067e7ce2184ed7a1d","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.906729f142.tgz","fileCount":11,"integrity":"sha512-OaZEWM+qxXjXmu9DSO+M9XjA08n8/bfUeYIoDlkFfSprj+ns3XmZvy/r7TR6r0sHiS0NGsy8N5yZc5/ahtWNgg==","signatures":[{"sig":"MEQCIF+mXwIbxiYKGXTX5+KGRSJ9wZejF7ariSoRVAh2NmNEAiB0NafbkJJi7FFv6lM3frUnCrHPOvNWhOzsD3dnx5UZCg==","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":110343,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.4\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJeeqXgCRA9TVsSAnZWagAAtSAP/3a9rMEmOKz55gbi7x2k\nK7GVbxd+Uf/q7RCqNIUKyJSLThpgvtfWqV4VAF9lTLpighhwCFMuJH3AavR5\n7cFtmt44qKgTv6D+E1TOEaMQT32TotK6Z/6nrKJ/nVWdMxrjQ/4CUM1tMpXv\nye11PgyMMwKErIZ5Q5gpNpqc3kWNdanH0ujeBSVExtUorPMQOlsEL3mXp4Dq\nMp658WZDU1FL8g8cii8c8NIOVzb8bU6aYB05Pm4sQsPq+TK1q3aOiWix/G92\n46HXZKMNIme07BUgLLymbxR0G/NuEGHR42uJeyUvKRTXz70EejaF3FW7xSd0\n86AvoGS6r8ZPvhl6kAHsK959OoHVl5RV91+f5jhxHyLvqlVytgNhjpvVJ+L8\nyPJ2wECMf2pPXlnbufU+y9z8HVSO0EhUOdPv/IBk7D/Az4BlxEYpoundftsX\npRIu1xbP4DasY4qIxhM91dI8D/aOcQmHSqsLUTjfj91bYP40bQ1G27bOLfP3\nyVPN4FuPgJhpQglyKXWYEmHhtqENWQUSBzlwL4vtbD2tP1sm8yHTrAdVW0ls\nifT0F0WRT5PUaAnCiwFLXPhujtTTuocrL4Jde3xPijjpI6YDv6RGfKxxzJ9i\n30FVXUj02aXBQMCaKLiEdDnvhA8wgnA+yulq9i3J86VOOH7+vvOaClY7JtHU\nKjzZ\r\n=ViVI\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/extension","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","engines":{"vscode":"^1.5.0"},"scripts":{"watch":"gulp watch-extension:merge-conflict","compile":"gulp compile-extension:merge-conflict"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","dependencies":{"vscode-nls":"^4.0.0"},"_hasShrinkwrap":false,"devDependencies":{"@types/node":"^12.11.7"},"activationEvents":["*"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.906729f142_1585096160076_0.8868816307347334","host":"s3://npm-registry-packages"}},"0.3.0-next.ebcc8208f8":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.ebcc8208f8","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.ebcc8208f8","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"bd6a7e3394e04579cc2eab14e781e8655040ae2e","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.ebcc8208f8.tgz","fileCount":11,"integrity":"sha512-yyl5hIYel/QwPvGJauzE3trsiJTJlnxXeQBDTxT07HDnLS+y9wKs1QvQzbaqS/qodf4J8d6lhKG+pwpljGGw8A==","signatures":[{"sig":"MEQCIEIwB5Ap1ncH/7slL7hEm+gHJnVVVzJ6pmc5+0KXdAWWAiBUevPlzLqph/U9gpXKmhnhz5+jO1QL2jQf4EGq5pofmg==","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":110343,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.4\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJee/ZhCRA9TVsSAnZWagAArrgQAIw7OxpRlGOthga7jAsy\nQW0c4RLmqzWpL1QNadu2IPLVn2elaxFgAGU4LIiPatCxA1ojZct3pDPpK2Cl\nd8hpTH5Mo1aTS6mPzxzABfJoyiYmTBjHt8MZvYbbFaJ0Mmi9eqDL2Y4sTb4v\nZ5UiYYed7glvWehjdJKP1iqO/Ut/TfWTxu6Htp33csUsqHMU26OEbN+/+/Bw\n1hn5YpUX8tsTVz7GXXAL7A6+XtDtPlET7J7noJHnCYFML2CgZ7X/BcOg3k5E\n/MMnbp9hD4PxkXDm8Z4a5WQokHEHxgkT7IKRo5r7vb/hdvkBwVlYChESNun1\njYkfJuroHWhFzxCv04aevYjpVYvxsyeSnW10Eb6t2Q3cOfE+tf/D0CoosDT8\n+h6Qh5mPtamc3yJm6rPYo/LMEHSoddnF+j8OTvmT/V1uZDZj2hHv+3BGnv5y\nNqwkyF3Qm44bkO37N3T78HRiSzWkTbuLQhXQ3N9p15kEMHOzP+SfD4v+D9XI\neRyvXBWIL3MZ5VquzRmQxNLldNtz60HWZHHZebYDQCYVqPELhnbN2WcTcLit\ncTpc9hUYb6GQ+npG5al7oZoZot/OoGLoy+7umLekbJlW9i6h0YlHJ32y4ny6\nk1poCbekzaCN3RgFc0zSzPEtY1HnBWS79E+rDNM/D+QcyClgOY45Gt3ktdiD\n1EBq\r\n=61Gt\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/extension","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","engines":{"vscode":"^1.5.0"},"scripts":{"watch":"gulp watch-extension:merge-conflict","compile":"gulp compile-extension:merge-conflict"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","dependencies":{"vscode-nls":"^4.0.0"},"_hasShrinkwrap":false,"devDependencies":{"@types/node":"^12.11.7"},"activationEvents":["*"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.ebcc8208f8_1585182305283_0.5693489042261592","host":"s3://npm-registry-packages"}},"0.3.0-next.d2ae19e76f":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.d2ae19e76f","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.d2ae19e76f","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"78d6c567c90ea1bfb3b97196a34c29dc0997a6fc","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.d2ae19e76f.tgz","fileCount":11,"integrity":"sha512-tDn6dz6V6S/lP5BVE4NuS3QUzTJ5Z7jtsAdHKYS+S9RKWPbdc3UxC/CDeCfEkuJ95l/6Qe1KbZv5q+V7CtLeXw==","signatures":[{"sig":"MEUCIQCd4wI0T+6HsBoPprGzjpoeA0k+TA82Wwyk9BibIuvDLAIgL5hrTCQAOI8TQoCARtlYzVZzb4DO80DMVqgoIZgn2AM=","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":110343,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.4\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJefUkACRA9TVsSAnZWagAALYoP/1LoDPq+ohcZ5oM0EBH8\nUEPfddJFurj2K1DHY/Xe7jo4reXY822SfxaGITyrz4MIETBr0Kwt4idWJIh7\nEWJfKW/bR2BB395cguhqAi0KJeA3UX4WGLLWVGoKn+luDxBm3txu6+4sGcWA\nYS7FGKhJmijhJznphSAb+pC5YQzZXuD/JaQRq/vrC+O9I2UwUEbpYSojEHZ7\nz4JuJuwxMWLlW8twETHPcBg3ZeE8bBuz7Ri0NgaqQSbb3paAkt6vrBK7vwO0\nCEiW3MH+/gmxfTFb54UnmjsVq2ESop4eM/qHWK9jfKXU8jpZeLWvpVW3yVRf\nn2T8QZ89jy4JOvFr/iDl3TMKn411hLZmhyNGrJc1+X2h0wGtS/wBKPTA/K77\npobBBdhsVXzK/ay6yVvJXx5uJIJgB5A6SwYSn/83i98QSoyYoNy51QgrMo9t\nQEjQwzzjZwfgeCFCP6yFksrIqqyFqME24Nj6EZPY32KLCfq0O2+f/1ltUT4X\nrKsXuDrUblHSgsPafd86PnGfVrUhPZngkjuolyxVIPFA/XIo6q0CzAaP3tw/\nDkKbmTqwJv35hf06V8TPUyP1vUvH/r8TRElY4hY0yaVrDlSwTvNau6WfhpAi\nTBU1k/ijlEXQzYSnb56SBK9w6IYYTXmeaJ0RK8TGzcXOfY4S+FYhTpERA7Ge\nUaQn\r\n=NvCP\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/extension","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","engines":{"vscode":"^1.5.0"},"scripts":{"watch":"gulp watch-extension:merge-conflict","compile":"gulp compile-extension:merge-conflict"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","dependencies":{"vscode-nls":"^4.0.0"},"_hasShrinkwrap":false,"devDependencies":{"@types/node":"^12.11.7"},"activationEvents":["*"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.d2ae19e76f_1585268991634_0.8968778619447153","host":"s3://npm-registry-packages"}},"0.3.0-next.3367ea6000":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.3367ea6000","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.3367ea6000","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"d71ef60c4dafe038763d57c14c14bbde4e89644f","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.3367ea6000.tgz","fileCount":11,"integrity":"sha512-HNJ8Bh5oMv0JerXD7rhjL64v/ReI3m9Q6ejTTZXhf0jKD55w/9p1axQMopaA37rYfJMZ4IfobesVva4cQZt7hA==","signatures":[{"sig":"MEQCIA/F6JdV5d8DkGOxvNH0oeDlHYIuhBIH07rIkZ9rjP0qAiB0QT+uhZ7fsf6YteJ0HgSweugRc4LSAQMvWC08jMP9eg==","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":110339,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.4\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJefplnCRA9TVsSAnZWagAA96MP/jlzmTZfTVr+t0DmwP7O\nLQS4liV/1V7McuPkDw73qext3gAx+W/ghAG+Veow9XacRN8rO3SgPdjrtkG9\nJmlBAThRo0YwQqBFxLroWJZ1IW5TrzvRAaJ5DcDSWCE3wwOwR9FhXW0N3SCs\nGCQK+Ftfx0fsS3pBT5ACtPfcXzBVAJPDBwlQBHdguZppWyhORNN73QLL/2Jn\nMHhM8T6UqQaQ3fo5JzEtfWbcf2fQeTBivnm30r4Gvdnc7fgRIxFAYUEYTnk6\ni94bk+ljSxBmhQXjwPFaYdm/n0MH1b3EGEQRIC0/F9XakU6ZZrBYHbnZvnig\n2YWuwn1oEhzZ/mT5WVieXhLDrrs12VAdvATJ8lXGFZArX7HET7xwZw92b0kn\n8I5wedEr7wmmsoGagbONcbomFBpq9zV8mshAxge3jgz+npZIX+V6sQzEDwFu\n4+qXhV7+ecVWNg4PsQDG38vqt0Vbp+8NgfXX3mdydI10Uk1aWwAzKEdkGctQ\nlBmEqVBgTOABWec/vWUgUF0k6nP3J5hWLVBEoa/31V3OcSMJdpxMs/Uy+PJw\n9e2VTy6pSFhhwpnL0WkPLyzLGeG76+XxeTRAfHbcW2y5+wX2ee9YriD+B5lR\n1o9/GDAAqpIIkV96uid6X5vw8W021x5HOM5CLWxpkNcdKSz1M4u/EohcKAtK\n6H/I\r\n=lTA8\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/extension","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","engines":{"vscode":"^1.5.0"},"scripts":{"watch":"gulp watch-extension:merge-conflict","compile":"gulp compile-extension:merge-conflict"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","dependencies":{"vscode-nls":"^4.0.0"},"_hasShrinkwrap":false,"devDependencies":{"@types/node":"^12.11.7"},"activationEvents":["*"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.3367ea6000_1585355111444_0.37727616508153483","host":"s3://npm-registry-packages"}},"0.3.0-next.1ec43773e3":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.1ec43773e3","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.1ec43773e3","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"e46ef96c88981fbafd1b334a883416bba778226c","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.1ec43773e3.tgz","fileCount":11,"integrity":"sha512-6BkcUpuei8d7vuKe9Q43aJ6GakKu//DssKk0mz9vBA2FSyQtOmBxM+h2hOYYFW/U5KGVl+q3smcAYjzVDXPnwg==","signatures":[{"sig":"MEYCIQC6xnCUjJIcphTyuF5saqZ/oSi3VcbPU6dPbYc9Dns3QwIhAM689WYlJPhh0JJbE7CrjodZ6ylUeQJ97dZc/+W5Klja","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":110339,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.4\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJef+tXCRA9TVsSAnZWagAABGUQAIURTS2zKM9vfhK7645d\n4N+EJop9lDMXJELvjDlxTZqmdAAEq10jbLnYsCW/pvS5oxQRKYTw7VLvgZde\nQWUHrzvGPRFAHbtMpEIapy5dQ8aCjr3pb0SRY9KI819sYEt0uTQhF/MHB/9w\n+2++Jy3lq1aLnm+YelTu7ZnL0iNL2jUTVxCedIA9TQGpXHaee81nvUgOkqG7\nf04Z9jnkYABD+TTaLqVgDcA/gNos2D7Ty+XU4sWsEoIkUZ/qRgVFGaUft4P0\nAgdwoTC9cT7PRCxEHDMWYFhiLSQ9U0OHxzCqTKXHwmgs7pr99U0xA+BbkLDe\nPr27/WXgNfhpA8a2dRFgDE3Q3w7TSzbmPl/QYVpcCXaaflfMze5aTaUku0KR\na9AL4eyIhJaorb+o7CNr+8mYM8aWncWhCFxNdOBgOs/EkjzEy69D9fNMPFTz\n0VB+/5Q0gfv8HQ5zunxAmvwEfQ1dyk5etT0K1KGwKGSRahIlhQ6p3jBxeJgw\n/xWNHAk8qMVMpxp1liw/h8ssHKhhu8mGxMNiFCNQh3OVQFJFW+IscJ6lSi42\nwNgf3K1E4bQazSRyTAtg0QniU+iLbNMIz6RLxv6DWz/wk2IIZpfwLQRMTYB6\ndVri10b+phL2p53Uf322Eu0zok4d3jVquHUStRIi36ZVcG+rRPKVgF2Pw9aH\ndqjJ\r\n=RPI4\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/extension","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","engines":{"vscode":"^1.5.0"},"scripts":{"watch":"gulp watch-extension:merge-conflict","compile":"gulp compile-extension:merge-conflict"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","dependencies":{"vscode-nls":"^4.0.0"},"_hasShrinkwrap":false,"devDependencies":{"@types/node":"^12.11.7"},"activationEvents":["*"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.1ec43773e3_1585441623122_0.23902902987226615","host":"s3://npm-registry-packages"}},"0.3.0-next.d05e41bef8":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.d05e41bef8","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.d05e41bef8","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"62a19ead1141f7304b9724b01fc637310646d882","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.d05e41bef8.tgz","fileCount":11,"integrity":"sha512-RhIKgFEZBxUkrgJ8nKqXfsNrdDkJiP7gYgMgCJt0KuwmF7XLA4KeIBOCMsy8lPoqah1MeVuWXSmfUeS+xwuuCg==","signatures":[{"sig":"MEQCIArVTWD8dEH+smZtvRXLzg6AGgXNlYWqeW/QSko51byYAiAV9jV77gxalZEBZ/yTaDRMsNpzkBVLnp8RC2uxB3knVw==","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":110339,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.4\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJego4HCRA9TVsSAnZWagAAT0EQAJvWBSVd7x2NmA/Solk4\nI/SoJSz35WTm/VeYh1bgKkRIeR43DJSticziB1zI6xtPQinB200hzhhYX6gq\nMoRMBBdwnfZ681bN0LUUAxdq5HQWUDlzFkYYCBbkHFVNpqjdTjamOSPbEhNJ\nNEGUBSNM2xJBP/Xc2zQGz/SfcwRiosDk4K3aF8saQ9V8FmJOnrBd4NskSf+n\n1tkv5st6KEeni+QorMVdTli5wILpPQmCSCn9x0ggwDdTKzciUffnpERbrAZr\nGifxnJ50k5mB4a0EngzgizskxrG+r0f/nMS32TYQ5KTM+aI9cvBnVXB15fNS\ng1mRwykVEz0XDGi9aJRFJHOneJsYybMlahv5RG28v31T+M2Ov/Ik8z9mseT5\neWdMPMCC1sgxUqM/jneefcUYgNjESbz/NmrTe8SCCPSzv99K8m/wiQferBJJ\nien6fsbWxchNRoCWeK1yISZTJKBOwhqJ4SJ3bUpVl/hlTif/aM2EAPjtPOS1\ndAW3p9dIn9CjIrvwmHCzU/BRe2yn/5d9xJJIMygBhpBbc9JlbRM+DjglMrvy\nzDjK4ZBZSxMMIw8jQeF56w9u/62BaC9wUJDg1FtGQKpsV3gpflrVkIngJqjV\njtwBF4SYfLsrI5q5CC+/CinzHDkKfuAV69WV3VfVS+my1jng8OxlOJoiinbe\nUf6b\r\n=cP7s\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/extension","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","engines":{"vscode":"^1.5.0"},"scripts":{"watch":"gulp watch-extension:merge-conflict","compile":"gulp compile-extension:merge-conflict"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","dependencies":{"vscode-nls":"^4.0.0"},"_hasShrinkwrap":false,"devDependencies":{"@types/node":"^12.11.7"},"activationEvents":["*"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.d05e41bef8_1585614343498_0.971704388255836","host":"s3://npm-registry-packages"}},"0.3.0-next.3714004cc8":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.3714004cc8","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.3714004cc8","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"329ef28d773626b4b5f63b982748f167972e09bc","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.3714004cc8.tgz","fileCount":11,"integrity":"sha512-94MsxjQN8UYnW50VclgCuhX4KGoFvROL8WbF6e05yhUIFMcC9B3VhYZzIsTuVZfeR82DRTQT9LcI/KUQM4cDew==","signatures":[{"sig":"MEUCIH1nM3Ffx8UfGRUp8pDr0ZCYb6Z8MZ7dm4ig3IY23KZmAiEAlcJhPVsFZpWL7c+hsiL5s8WAJk8dELIQslc/O4KVcs8=","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":110339,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.4\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJeg9/qCRA9TVsSAnZWagAALIQP/iR7smaFC14jix/iBXW4\nxCPwD+1PkHT8iwC3+JssXDj+M6LRvRNMcbmIWatK9/pr3Fo3kl8cQLkGSlBo\n1/O7FgzwxPRWfvR0TiQ1/mfKFxYPjjOrkoWGq/LTtIIiyAiIfvFwl2HyBIBL\nucCPLNEXYAYRXXWCJUn4vjDBQuVopIUlp7Bd5gsgQXuozMAPxlPwtzAxXmFp\nI6X9XEkKTkrD79ZOZlqlxdppix7Q/Lr6ZHpoQYUISm/5pj8UK648dHd9KuiI\nS4tr/xUiMpN61Kn2LWK2shPoCfiWxCD5sgvgsJqLHhpV7bkqd5wqbpg8RoY3\nP5pHST0ElR1f3e+KhmH5QVOF1FgJdFrtNZiQtWkftozQWuf6Z1tmmC30zTnl\n3Pkb0L67a2Yf5N11yzGhLlCuVK7lb+TVcM9C32KqDoX39X/kSWVxTcvjf9yE\nONeLf6eZKjZbA07EQIFKzDGQg21USj4TNfcIzoDvIuhp7TAWTcdp9DZfMIyL\n85f8l4Anxvh5zDf+1sT7oX5Q8TcWSg6se4dXhnO6xJ0PaxYqbtRqam8q21Qf\nJ1MBH1ksXdXERHcFPpoLdG/s71jVchoowunplURe6vbfkEcLODrz2t0/GyCy\nz/gDljOCkz3eBgy3tTts5e9GeRrbkd10EC08hApTeTP9hy9eOZZ7KCHE+kWD\nXbFu\r\n=dW/e\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/extension","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","engines":{"vscode":"^1.5.0"},"scripts":{"watch":"gulp watch-extension:merge-conflict","compile":"gulp compile-extension:merge-conflict"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","dependencies":{"vscode-nls":"^4.0.0"},"_hasShrinkwrap":false,"devDependencies":{"@types/node":"^12.11.7"},"activationEvents":["*"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.3714004cc8_1585700842304_0.4390216488407772","host":"s3://npm-registry-packages"}},"0.3.0-next.7b488119c3":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.7b488119c3","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.7b488119c3","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"48db8f88a11c5375aaee9eff7b09595c977ce064","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.7b488119c3.tgz","fileCount":11,"integrity":"sha512-a9oOIxdgeKgL3fSiLu7VHJPffj6ckWKaGPuu66zGc1t3i/bvUfIQPALGD/XPZAQABG/gxOfd7lg0Y9+ImPOizA==","signatures":[{"sig":"MEUCIHl//LC1ezL3EzNzOekXHsDZe3nyAVRQmsx0jUhcD3dnAiEAx/ofQ1NBTJjUykn3+7XVRPsAqwnUXbBCkhMwINc9tQo=","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":110339,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.4\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJehTEICRA9TVsSAnZWagAAqokP/3myuEMa9eFyeVppVgpT\nQoESytyHknz0e5Usy8w2OnJqLdWHlnOQK9uWo9bBUwRKDUxrnk81ZiRwmRcZ\nBhrZVphKmkSqvY7ctTkbf0qewlYh+stGdgdsLGuLqqeX0x7aDCEQoednxw89\nz+r3cQjdlgMbr2ddkHEeiuSndRJdoXxANkltZj6gsXfTAun1MtPQEup2HF+4\nMqDFfdIzBBpNYDCOi4vtRCd7S+Wmqi948w+TU9qQg9e6i3NbVdeVAJ1NuGoF\nodsmNsSyHnibpNajVLMPmTVS/8LtVsA7vuDbUjTrkm4cGoQUIuRJfcnM0rGO\nliOaeRmmZQ4O8tcl0z1YcsQgE/MZdyjWMwjyC6Jm4YcD9QueTjhG1q3pLT3K\n6/f0TkSSFxXoDcTdgcH3t0IhJwA7QsEM/hwv2WZdP94yRw14JjT3Hqe1tQPF\n18Nv6RDBZioXfa4mt84SdeJSWxv246jLeXKP+C8hoEhsDSTFrq2KVQaLOkuH\nkJwf1d4LA7goqNwFOi0pB72JOHSp+57+T6sUH0XwZ0ifO8fuQQz9pXnfTQbJ\nkJa1s+/ElzXsfK50zGAXFOualjO8kXoaPIvGxauR8W9x46qTnWeL/Fg6kFeH\ngoRFStuI0KpPFFMz37Kd4rh4o30Trar3gEP9SfRrGzQNLnDdIcOFPDqLk5ik\nbU8u\r\n=OMeC\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/extension","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","engines":{"vscode":"^1.5.0"},"scripts":{"watch":"gulp watch-extension:merge-conflict","compile":"gulp compile-extension:merge-conflict"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","dependencies":{"vscode-nls":"^4.0.0"},"_hasShrinkwrap":false,"devDependencies":{"@types/node":"^12.11.7"},"activationEvents":["*"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.7b488119c3_1585787144134_0.6488098737694483","host":"s3://npm-registry-packages"}},"0.3.0-next.30a4ccedba":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.30a4ccedba","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.30a4ccedba","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"6339dca0ec99e1a0b6c69d911913801e81a9ac9d","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.30a4ccedba.tgz","fileCount":11,"integrity":"sha512-+Yii0W8sw77UA47EboYDCPw/o8YdmKd1ZFbCJ49avAPH03cPiqvn/Eaa4Jc4c51xwf+BXlVfAfmZCtG00gCmlw==","signatures":[{"sig":"MEUCIQDygpX3uygOdGFx4hEigjZWJqyHrRer8ChLSW1lt7h7xQIgHJ+vh2vN1Y8fkQBeoh2J//wRBujarhe2jJK0BDqfsEY=","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":110339,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.4\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJehoJzCRA9TVsSAnZWagAAHt4P/jGQ7e9hrgymHyJUi1WT\ndioGFGs6MNgh3gfZwc760OgT/8iSimmlYYPV3Dgqh2DRzXHjNzZyRkW5cdDl\n/8FxqB685L/OYX54IlYJt85Hzfs+Diy/Pv9iTvCpJkkUvkAaMA8X33U3L1Ef\n4met+8LGdU/1U3XwqgTg79bPIGJ9kuedosZph4JFHYuOxHIF79UGsCMWZRpu\nnVP05qiKi+2M6zOYsw3BPsV24PDvZ3SZUsdQHhZJeCCCHF/oPSFMa+5zoCUe\nsircOfCBzl2SCWo03I0qEplyGGb7M72kty/1FNECsqezAeVq52LkVV9X/nmY\nWpIDbMOAPBYgg/XnnAJ4juZVKufG0onnP4iJrdN+eTz9b/ZnQ0/VabFEXKvD\nBIkRedr2kReVYYhCAPYDP3fpDRVr8bl2pa1Z61iTz+bB2VUZ+6qAxGj1SZ36\nTUiIEaa71Z0JdCXVxSbwgAi6mlwHD+W6wLTP78F0vhbC/UBIOzLM2MPCaUiN\nNOKf2zXbl8AbchPxOJHq2/0FoB+XUIHiZgeHPIPee+VYAM98/Sna8Tw6NDGF\nOKaF83+u51ek/lT+vdINnlBmoL83bNEGF12dagWpDiJq8w3LcO35xEkxNiRd\ntGrcO0UzKiS2QysQvxkBKBfy9Kec1aE+WW7sTGooChaBVl8loNKmc+6SLukr\n6zP8\r\n=FkKI\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/extension","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","engines":{"vscode":"^1.5.0"},"scripts":{"watch":"gulp watch-extension:merge-conflict","compile":"gulp compile-extension:merge-conflict"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","dependencies":{"vscode-nls":"^4.0.0"},"_hasShrinkwrap":false,"devDependencies":{"@types/node":"^12.11.7"},"activationEvents":["*"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.30a4ccedba_1585873522472_0.40655800699079103","host":"s3://npm-registry-packages"}},"0.3.0-next.95b39f4b08":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.95b39f4b08","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.95b39f4b08","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"a6c6af8abf9c85d50b3c767fed1824b36b31d9e0","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.95b39f4b08.tgz","fileCount":11,"integrity":"sha512-/3xwrOmuSogptpSaxWKiOruOvwt+vz3TA9LmRq8JYCxsiIQNCZI+77h6PZ7YUYda3WdpyPTM7hbH5ANu6J6Vkw==","signatures":[{"sig":"MEQCIC+xixgYeRN/PqEXknr/EHCFgHeAqUB9+cQZRrD8mewuAiAiOz5eclOmTs0JiuPpBtK2LDLD7Gp8G9rqrSW6GUr9Jg==","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":110339,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.4\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJeh9QKCRA9TVsSAnZWagAAf+0P/AjUxreR5ZDcLMYn36iX\nMAsdfj6Zgc+6RST6SZJmnNbTR/AnWrTECK/qaNAGv1OX/9xkFBCH3U4/z02S\n9k4Yhg9UV63H9riMY4uWqRKOaE7DS+yqz39chfdZbwgESjAxJvguTYP4lYOT\njHeyYhYWT1AuzqwQPbcbNAyyOV1P3E8DOvuYmNwvyYhf3NyvMtcLv/Y8DWNG\ntmIVTeLAys++ufjPIDz6+4YtXBSzpMSIHEBut+lSV19GUv1KGO5gGHOu5Me0\n6w6KzDA21du/o55d8cqZ0+4TwVgyUQJKFb5P4j+C8J/6X9cchtrCJzc5YQDi\nahfSB7OHxbO56q1dDPz2bf0L70THqQgt1RfswnP9Rwy02BN8wCcIpcvC/oxg\nRmcvkWNl5+JXD4vNswOMyj9KqQS1HCbR9e4izpfszgfaN2ndCZ9BPpLmDJDN\n0GTf7Eb2AywWBSWFgegvWy8KuX0OiO0+xdTfXLBAq8sDUb3F1GbpuS7pFDzH\n5HL5cHV0tM4/dux6S3wbvEmuHM0yMi1m6hl3qbeabn+AxIGgVncu6pOl6jL+\n+XK9vhmJVF3bbnC7rWvsf3/W8jESasVrAWfrr9bWV4rYiNLEHbXtOubhYdF1\nRBLKR/Ph4lW77fqX84dahefqRMB7ns5E618gmr8SDzNenS34HThPUSTMc/83\navVx\r\n=5zem\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/extension","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","engines":{"vscode":"^1.5.0"},"scripts":{"watch":"gulp watch-extension:merge-conflict","compile":"gulp compile-extension:merge-conflict"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","dependencies":{"vscode-nls":"^4.0.0"},"_hasShrinkwrap":false,"devDependencies":{"@types/node":"^12.11.7"},"activationEvents":["*"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.95b39f4b08_1585959945883_0.9355375522555314","host":"s3://npm-registry-packages"}},"0.3.0-next.6fded8a497":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.6fded8a497","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.6fded8a497","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"8f3b89f07e9be60260e753cf9c0e667760cf291c","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.6fded8a497.tgz","fileCount":11,"integrity":"sha512-nCBygW5Hq2YlMOkMoshnTWwjabLnsnAM4mdStwpyAvgQurrWgehkdx6pf7f2Gel4QbpNAkWgt7AVhYxUz3CpIw==","signatures":[{"sig":"MEUCIFDYrjyXWh6vnKvbTYuNc1C6gmjTh6igKqtzp1yRHiFfAiEA9K6lR5c9v7XyOsX7F6k4yXO2xsIx3vnf1wBtnRNI6RA=","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":110339,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.4\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJeiSU4CRA9TVsSAnZWagAA2JYP/0Uo7HBDqcVKU8T+7MGz\nkeamFuf98+ufEuUyeorbMxt6exwsqnBKw1t/rwEcUcQMIVGtG+JLFQk6Puhg\nsWVRBhFqO3fBLbwp9yetjb5DN+ZlbyRTCN1Msb49UXWyZRhFybp0bva8tdEf\nysUEfyrrwhBsXJ9Ip6iIfAAVzUI3q3D6LQgKB5cGiew38UMdxHdwJTaP//ZS\nUm7p1qYG2N6/z+MmQMjE5ZJk8hDcAHuY7N6cKy6IOwN6TB5DgwpUtXMSolEo\ngEkn+Jd2os3304/ebWWQFAEE4T0oSs/rTIsjBVM7TOr3NTnAObBz2xMMYW7e\n1L611lsEoAjxLmAvMMdbfXW792lbGR+DZtGaldLJhgZy33I6qUvltGeJmGW2\npRzXcrP5Wql9nME1VHWHwa/aXcCxE2j5rfrUy2MNpiIUlDf860ikZ7n1Mfx4\nocbVOJmMozNTAVi0asbMrF260x7JnITR6wtjKaysxdfOjZ681BAPVQM9fWJn\n9rmFM6XfYWYX0LHsUB9PpgB2KO7tSgOaJ/TYfEplcQsEdhU3UkkjIhY3ppif\njxOVD3FrDV8tvEEkLBjv45IV2h4xjJO+I4SfVZDPtJC9VnJmu1c+tfcx6bJl\ncG9OjAxrsjDsV/m3gTa5J9LzA9Omk84VSE52DP9usKUWvg02Rxdp5v61QUh6\nVdGJ\r\n=PA0X\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/extension","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","engines":{"vscode":"^1.5.0"},"scripts":{"watch":"gulp watch-extension:merge-conflict","compile":"gulp compile-extension:merge-conflict"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","dependencies":{"vscode-nls":"^4.0.0"},"_hasShrinkwrap":false,"devDependencies":{"@types/node":"^12.11.7"},"activationEvents":["*"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.6fded8a497_1586046263831_0.14515470874736836","host":"s3://npm-registry-packages"}},"0.3.0-next.6526fe0a1a":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.6526fe0a1a","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.6526fe0a1a","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"6871d1ed1f4f9f5194a0fbed46abf6b46e4d1f0e","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.6526fe0a1a.tgz","fileCount":11,"integrity":"sha512-QS7TlMOOxW85m4MbqlAFUAABfQBDwj7D86kAW5Zt+afzt5jMyj6tlUUI3MCaC1S4HjZxrvdmXFHtEehf4KyROA==","signatures":[{"sig":"MEYCIQDuzaPxxB22tZpRCYmRVZzqh9ei3NVUzm6orSZk3uVmogIhALFPDpmAST72mIpwL+teOZtrS3hyS9SiVT6UqWX7ctVC","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":110339,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.4\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJeinaNCRA9TVsSAnZWagAAjQ4P/2CEbmmQI5nTRJnPlW4V\nskcHy3nFPYOSvsPbEYeCzOhBPqr6Gf3iX9z4KUZBHqnxBqXcUeZAxs1DqqVb\nL+PIFxbIcqLN0vqGtZOgM6w+9z2+W8Umq4uh8Kj/jfacl3YBZRNux8KKP+/4\nv/VZnUkqZ3QPSefEzsNUJ6vnA3Hi/qrzbUh7MTBww4Oh4dmuH0cZipo5TJT0\n1ERmc1GAiQ0lTWTSUMpzhcJHNirBm97ZpU5+4qFFggIWNbPJTvFc5FqZ58TV\nI/QetP2zQulITo9WoN1uBwi0XW3Ez/f1IY8YfrjMxb/EnV5i2VxefghgM4B9\njtoGEZndQ+EopIQUkNxRB3an7xwitFUyqUqe7lymJaRbk37WB9BYLSa+xfs0\n7n9bo4GmV/RUl2HgYmQTwTsdijmwVgk/RzzxVx7+40aBXkl7ilHR55kXRJTa\nWsz5hnzKVD0Vg2OHrpdS7m/SniOo1dJvbBufn0buYqrgO3wt7UlfQsazmCbS\nL46/jKJNIztJbxast0SqB2Z25SZZAUTB1AWLHpRO26M29Yid1WMb1j9yNakk\n4bBfc6szVdbNnMRtDIPB1jCqtKqErstdIpEV08vxTo2lFH5ncICgj3DmP0AV\nou/UGYg6xI1Nz30/hvoRX8bAnM/NgFHnaqc21MNZMfh9+Yk0MFl72BY/KalA\nEzIP\r\n=ko+0\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/extension","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","engines":{"vscode":"^1.5.0"},"scripts":{"watch":"gulp watch-extension:merge-conflict","compile":"gulp compile-extension:merge-conflict"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","dependencies":{"vscode-nls":"^4.0.0"},"_hasShrinkwrap":false,"devDependencies":{"@types/node":"^12.11.7"},"activationEvents":["*"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.6526fe0a1a_1586132620951_0.8413013673413048","host":"s3://npm-registry-packages"}},"0.3.0-next.af5ab57bb5":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.af5ab57bb5","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.af5ab57bb5","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"b58c532719df175cebec8d7954cb698f440f0773","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.af5ab57bb5.tgz","fileCount":11,"integrity":"sha512-nC1oQI+6/WqJQnddhbA6ele4OQIQLGkf5AZvR1NouF71GQIZQAVshgSYDBUhMzOe21dGNeKyAGOh5xjMSR351g==","signatures":[{"sig":"MEUCIDtnu4nkH7w/UKScTw17iJBQCJn30L8scYPkiIsPel//AiEAtNDca4PF6zh2NVi6FMjKmXghJN7M0cS5G0jtjbn4Pw0=","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":110339,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.4\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJei8gjCRA9TVsSAnZWagAAK9gP/18NRLdUVOU6Xsp2pGtp\nGnkB+5UI3Nf8u33o3sR1W4wWghB/ADxNNnu4FRfV6zYbjuhyjxkuhaLkh6eh\nHiFH2jTZZLtyhzdUF/5QCHJzEHQwVgtQiu0D9tk3i1lnU/8t65yri2gVtNI6\ntG2Swpgycrlr7JZ7hZ0kMV3LAGeUqubewlm0j4uRchtDT3c1I3CI0W4Zmy6P\ngwpPMrddm5DeuTs2Scf6qBQAfBWi0Z4fAOpxkHfvhn7HBhNCNPfANXGgbCWe\nhzSUw1RthzFr+KioAcvCoXSR4P43hNHtuUHlmiBnsZB1VQ2mK7b9Z047RKNw\nuojDieA/PABr4rPC7wGKqDZqlndAJ/cTaduDX6Klnas2lqfr3ke5g6Z4CFhV\nBac22iX8EjEn7j1zON3ueaIQaa6HkqSOD6Hx7TYRNa39638KDd8+YLrOX6so\nlmPTyJSsSWtmGCX5zqlGZLL0H6v29oCY+J/H3E+GShydHNKisFNBKzeHwdug\nApYNZOzXFF5nEZGN3+ZaA38vhe1i12skAT5uYu53I8V992rSYsmd996AFuYn\nMdCuAH+78q5Z+XJdXw94VVJ6Q0G+yjBJRk6vNhHILNFfkbyRlfrKy7So83UR\nvqvEG6nqy+Y2uyX8L3ethx1yMRT1koVxkM5LsVnOD0jAiMivTO5rlU90r4N7\nLdBL\r\n=ro7x\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/extension","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","engines":{"vscode":"^1.5.0"},"scripts":{"watch":"gulp watch-extension:merge-conflict","compile":"gulp compile-extension:merge-conflict"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","dependencies":{"vscode-nls":"^4.0.0"},"_hasShrinkwrap":false,"devDependencies":{"@types/node":"^12.11.7"},"activationEvents":["*"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.af5ab57bb5_1586219043091_0.9453616524797921","host":"s3://npm-registry-packages"}},"0.3.0-next.52d27e2c92":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.52d27e2c92","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.52d27e2c92","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"d21a8609685bcdd27d4e8736afa69b64941d82cd","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.52d27e2c92.tgz","fileCount":11,"integrity":"sha512-OvMlXF/UNMifKsvKfa+YYBKKzRIPoTfrrQsXqW2Y10E/62NHImFviN5chTdask7R6jTv8hWKbWWD13eeV7e6MA==","signatures":[{"sig":"MEUCIQDJrPEIBFeqck4OE3YGiN42PXnxkeYIAOywnb4R5Ejl6AIgBLMJjhJ7hZh0GLQV1RwePAP3e+deZJf8CJlGshS7yGI=","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":110339,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.4\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJejRijCRA9TVsSAnZWagAAxWgP/3SSqG0qIGMGI0VlPAn3\nWnWOGkHUq9FPKFRgKFq3g8PcKGw9PtvZDMoCxmRPylqTvMUeJE4NFCso5TtQ\ninVbOrTxWYg0IhMRmvavUTBIGJfUHr7pt99dltBrPGoqgp6YaKy2CRMp8jAp\naF7HDHYCM//ju7MQg1hClAPands7ND3o052G0FyHy2nheKSdYnfSM/ltp4pp\n982Wxk0J2RsCvPRZoXAqA3y3+niqyC9OfP4APW1wnJAuOX12yY20as61ugab\n5wQvfLugCwyzlE7FyHnPQtbXD3xpfZtYT3PMuZFVYSqY9oV9Mrf32qit/42P\n/4GFqbOfkMcl7TvFZh4uVQepiuSe7eKBCsHHuCTuiPaepOGAdBTdguTeCyg5\nHhsOpddztGIzI+g8KEsGAuJqO0gqYfias39ljH2VjkBueZCQaC1PBwymbLTW\naADxfLxHkw16kUiY6+PppHCGASj2IzbS0iTjJcZR55ilU2rAQANAtjzZ3na5\nnRY4zGRZJNwyoi0QFkKy2YTq/DouKHS0H4U/7WLmpO2iQ4m3PTSBKSoh3eyT\nhVeajNxHotDHkiT0Ns7xQQCgWrOwMnowPKicc1bmuHs+j7cElUfYV9JEjRKr\nmHzwvrLWL+MYSWKz31Z0O/HMccXMFB/BZkNbWt6VFaf7+lHPEqFOE1mYabhM\nVt1o\r\n=jjKz\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/extension","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","engines":{"vscode":"^1.5.0"},"scripts":{"watch":"gulp watch-extension:merge-conflict","compile":"gulp compile-extension:merge-conflict"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","dependencies":{"vscode-nls":"^4.0.0"},"_hasShrinkwrap":false,"devDependencies":{"@types/node":"^12.11.7"},"activationEvents":["*"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.52d27e2c92_1586305186770_0.0545817581696586","host":"s3://npm-registry-packages"}},"0.3.0-next.43ae69de18":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.43ae69de18","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.43ae69de18","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"584c0d307e1b3b23bed88eb7b1a429c42b5e1854","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.43ae69de18.tgz","fileCount":11,"integrity":"sha512-ZUddJ3kN2ZXOoElBiAmcdOvAC3lAFyBsceAi+lQssU3iOBhQHUwvL2OU2vSc2WV86kHIuaMX/PTP/MTMrsTuDg==","signatures":[{"sig":"MEUCIQCk19m6k/vtbAhKFRY6oYv2EIUHgkKCmWYa5WNEORn5rwIgFnhIoD+pxBlYoNaFOo7V0IAy/lehSS/kn1LZbmdawmI=","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":110339,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.4\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJejmsMCRA9TVsSAnZWagAA+LIP/A3tWihJGIebW95SomNV\nsW1ROZGY6VZwacV+TTScXbVLOvnJDkrbxn/0lrCq6abTq+lOBordsKS94bbD\nFIh29L/O87aLf+tHO9pxUdD5voFPB0Z8Wsr/lgUCiW+J4Lp3XnRLpZrXwSBM\nnMq2mwDqWQka564gBwU+a4tmym/L8cxSdm6qJyqT74x/yc08RZQZ7zWaruWZ\nA5jcEArlr/SAZbg9I1DWio1vP24wgcipVHxDNTDy3DaUvuJLuUFl78hjQQs9\nPcTINOcclKsQCGo+vIUOX3zxyUjZNXPtALUL9QtduN1cHIAtxPzUOi34UEP5\nWF2grqawddMgrz69gVc+ggvw9TfzinTG3oNwWb4lh3YFrnD9BDf8ph+S68VT\nqblVTazRAX0te0VvwHcSv3ZUZMbJkO63+yttyvXw2dinklPgfly+GPstJwmQ\nH5Y/wR4IpZY8tyATObuKJKiqmTvaRFm+JvheA/BGkp+xNXBMTOR2mR+7u9LO\nXu9DH7X1e/neRNRWCN97Gt0HQdaPKMAcStUtTiGcmPHuvRugtMhDB/IPfQIO\n9h+p/e17qSRWI1FBraLliiIa8wMTwvNII3VW1WwLeVrMWGthvPQpj98H8lPj\nAZloNi+R+wyor2OxAfgES2/7HPavyGkgVy3tmHdh5PiSd159Xv0asATuZWsv\nIEn5\r\n=w969\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/extension","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","engines":{"vscode":"^1.5.0"},"scripts":{"watch":"gulp watch-extension:merge-conflict","compile":"gulp compile-extension:merge-conflict"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","dependencies":{"vscode-nls":"^4.0.0"},"_hasShrinkwrap":false,"devDependencies":{"@types/node":"^12.11.7"},"activationEvents":["*"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.43ae69de18_1586391820441_0.1574612587901698","host":"s3://npm-registry-packages"}},"0.3.0-next.73c5cab420":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.73c5cab420","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.73c5cab420","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"d80bf62cfc72742ad2985276b3394f0a35b6582d","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.73c5cab420.tgz","fileCount":11,"integrity":"sha512-9d1A57OgO14Y6kxoPpZLJ+AAJD5LBiz9rJpAr0LLHYPCNe34lk3m/zDgX6k3+V3QQmyFqOG7yRHRu2DbRjjV8Q==","signatures":[{"sig":"MEUCIQCkdDO9FvY52IW0/M2f0MMkecqTe1OpjN3Sex4bvx8QoAIgRY3R/DrdYiJZ6u+yaQKZpJW4vi8hIvJyROcKw0fgtMM=","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":110339,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.4\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJej703CRA9TVsSAnZWagAAAYkP/1bQarvxeAnRbA/FbW9X\nkOOOrA5owpe6wwDWpW3/P6n+xsAFLZHX7JgUMfiabchjnNKSykeWI2caj5LT\nCmOWxdrLMu7ofVtmuBm2lVRksYcX+N3r3Y1Rxi+sCKkIiSGPb3E8cqYXBZpk\nlp/BpGiO7dWr9tf9Xyr/njHuQVjgDWLsBBAXpQf3UvX6IOmNxkE/p+bf994f\nCqpEyOzY77p9ghN0GjI7ibfBYssrhKDTo1mvaxGkGViUJJ9Qa2wsgKZ4SMni\nLhdFM745moe2tdrVCBE2CV6nASWGMD14bHmPiNLHgKbDGp1ppLmOU+a4BZLr\n78Ur2nvRMayjqKAOGwqORa5/8tEn8vT4vQnn8MuifGC3OlEjk4HVNtvQUaJt\nwCbYs2Gov0QLRU1RWX8K9+kwqEYRmYDS4bVjXEthWB1y1C++iVWEjcKgTAFa\nfDE/x6jSAy+7Rs1PNZlBdkTJ96nG7rvwRYC3zg14WObEjyOf6sdo+m9eqF7x\n4ateho6CGiQFt3PYxQhQSh3amQvA/+V41Rvxs6przC81/l17k4g4NTmhaQmL\nd7HHoG86RdfbzUPS0HRRwcbdQVf+W3Aq1d5iFkDrkCWODL0TFxRhVunwd5ib\nPfaVS8x66UX+Gzes6D+yum9tCBBndFpu50fa1yH1SnFM+q6+qBgyUUmHxmH5\n6Bsr\r\n=McCJ\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/extension","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","engines":{"vscode":"^1.5.0"},"scripts":{"watch":"gulp watch-extension:merge-conflict","compile":"gulp compile-extension:merge-conflict"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","dependencies":{"vscode-nls":"^4.0.0"},"_hasShrinkwrap":false,"devDependencies":{"@types/node":"^12.11.7"},"activationEvents":["*"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.73c5cab420_1586478391317_0.25664507651865276","host":"s3://npm-registry-packages"}},"0.3.0-next.f3ceb33c5c":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.f3ceb33c5c","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.f3ceb33c5c","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"ed810be4a311e741883bedd74d462cd9c0e974ac","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.f3ceb33c5c.tgz","fileCount":11,"integrity":"sha512-JLVGN2EnfX38zkS/0io0iL8uj7Kg5BlreyFAaBHGQoRQDkde+BFIsL5YY8QqR+sNM6TVn3UygqVYQX8gGwtHeQ==","signatures":[{"sig":"MEUCIHDw7n2LuZ3w6Om84sT0zvXMUWEHWBXtVr7C7BBwkkKjAiEA8EOQV+7dVhu98CayFb5Ttdb4KM/TAUAzHKk226x3fy0=","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":110339,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.4\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJekQ2/CRA9TVsSAnZWagAAH4UP/0iaybWQ3yFgtA+7LwNd\nJzQVTp0HLUEvPD8gyUkEbWyZV1vp/tnW00GRTOl1fFuFK/MJ7B2EcyWAGGOd\ntBtNKGCTC/BXOstUkYp9P2+MbRYaCe5uyQEc5MeWkkwFRqjpkgGF8ZZYl/8t\n28sX0CavNcBT3S5hHkRomG+4uAcBFIDtfw0k+CJ/hokBAVkB2Gq76qi4MZ+/\nfExDmMxgpfXHkmIeF5X/22mYQrrFv37nRfUQg379+SHy5mLzG7iM32qIpUym\nabGeIruekSIPsZC+wqECXQKP3mVbC1zLD7ZPgZh/Rx3jfvXs3qPh3KcBb3pM\nl7lfCmzMXccWfZw459fayxw3vGHvvl3/KFVQtKZK+f8h+A2Qqxu+nMgDmpCg\nwxAgzX+Hh9nKCqv0XjAzBBHBVPH5h8RYJH20z/2AJG636ooJ1y8+tJ73BUWw\niDGQKzLD75hGeZMxRkz0d5yPGd9eMFNA5iT0ER06vIYx9C5WChuDym42AB6H\nrm4JLRDqUv/4MLKANu7yjst9cSK5Wngy23u/av142iE1+6ZTJgEO/zRooKRZ\npmNe+iEq8rvzElqVQAZAdJsJu+5pvTUJCQ8DWr9KaUFM4IyCk7iMmJv3Lqnz\nVGU6CBttwv2pYYo7q7Lr4248XlvveboY4hVBZOmF1zIiL2/TocTKGyZLLxNe\nfL8U\r\n=r+I3\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/extension","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","engines":{"vscode":"^1.5.0"},"scripts":{"watch":"gulp watch-extension:merge-conflict","compile":"gulp compile-extension:merge-conflict"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","dependencies":{"vscode-nls":"^4.0.0"},"_hasShrinkwrap":false,"devDependencies":{"@types/node":"^12.11.7"},"activationEvents":["*"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.f3ceb33c5c_1586564542197_0.8504468644732359","host":"s3://npm-registry-packages"}},"0.3.0-next.335de3b713":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.335de3b713","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.335de3b713","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"919143dc196931ead7d08a1b26856b698918bca0","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.335de3b713.tgz","fileCount":11,"integrity":"sha512-5DHgQSoleyfD9rTRp116r1VJH9JI9FyGpAGv+O0QbB6G5X2q/ZVhPhVX+VwtV8+66nWklunslKrswOiVqUwlgg==","signatures":[{"sig":"MEYCIQDAqi2YGwS9DcuxvKIcUgVt6Iuau2QMr8pYG6IaAeVUgAIhAIqUIlqp6geHm+/qEDqtsEyig1MqU6kvqwGclcnZV3bm","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":110339,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.4\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJekl+hCRA9TVsSAnZWagAAkvwP/jOCqhz2IPMtsuNlybjG\ndPa/KC5NusOg36bVplSVucTNUzF9hxuwHq1rxoMeY8qkm0ZDgKHSPOE6uv98\nEOWBCHVm8Etqq25ocb3VGbZGBnO6bALiROqtipYnG7+vvRibfajhmFalQ35z\noNvwzW3SlLstzHO1Gzvhwts6ESxJGnU19YGqeJB+Iq0YZl2iVgCMlf5UVQJy\nMfeN3CMP/EYYVjAkqVbep90PKm+wasGa6euaRLTLAhKjvJBfvDNjKI5zf4Fh\n4wNN8SWjvMqQUER3UinpFO7Dx85mnrFrP7BMy+txM4u3TLj1izVasnnrTxRS\nqUBHXEnWjeWDc4o70sl6ZyIAoAsaW29ulC3tC1l3b95ak/clmxy+JO12UCR0\nnf2fAAIOa1hVVEOJNz6zkt2obrl53tBSltbDiKRJdmOs4Sz3LmatIY6kngGV\nkrSamEwX9YcDFCupPAlX0yc0zIq6B/GJklcoH+TqtzKyWys8gjTtyl8eqHtd\nkJg3tpgJP+RfffkB8TC2Prc6nHu1MXuKhda3Okr1F6eAP7hRuKBWbL/sguYi\nLLCB7XpfX09Ky8nUwrfaRq0uZtexHcDOHnu+y7ukn8MB9xdoFQ8EgcWCS2mD\nc5WPNBH3gigcsLD5ONT3CEVDMp+Df8McKp6JOP5/s7Q4BbqRSWUxOaqN9/Dn\ninKW\r\n=XS9S\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/extension","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","engines":{"vscode":"^1.5.0"},"scripts":{"watch":"gulp watch-extension:merge-conflict","compile":"gulp compile-extension:merge-conflict"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","dependencies":{"vscode-nls":"^4.0.0"},"_hasShrinkwrap":false,"devDependencies":{"@types/node":"^12.11.7"},"activationEvents":["*"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.335de3b713_1586651041303_0.919829430327582","host":"s3://npm-registry-packages"}},"0.3.0-next.304fc630f7":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.304fc630f7","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.304fc630f7","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"bfa3238083f2a80b5970557234addf2d11922d28","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.304fc630f7.tgz","fileCount":11,"integrity":"sha512-DJ43SdTE0bDVjdJYqCmN+lLP77ZNjOhVvj8DKZouBLU0s8lfbuOHGGBZEoYbs/X4us/5M7c1bhyM9r77vgRzVg==","signatures":[{"sig":"MEUCIQDptJVYKdpCy1n9H5wCJym15jfolVNRsOCmUgt/7SmRRwIgMCEBffk3PfbKiSFOyB5Bx/FNUgSSEySA1fM0Dm4LdaQ=","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":110339,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.4\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJek7F7CRA9TVsSAnZWagAAncIQAJnOevBRRIiXJi6Uqb/a\n4hZ35dy4RsSycutNAlh4JKIO0u97fGEXJLYN3km2i2tVROM5BbNhyrDfZuKb\nNUx7e7GuuLv0I8ckr95HKYLuqSezrLRHJBmOHA1iuqREPk9OsMu29NC9yiuO\nCcNwFya6I9TB+82HYcWmkfQegiiKn6TSTgftGrxqMNFUknDXH275fXV3b3WE\n+iT0I9TuLJ9zwwTcDIbxRyXTNNKdfHzoyL85KyGwCf8ajMkgxokRt1SLjjmS\nlfX2tswgj5R72jGXhb3MO9Cfn1N98C5LbJT0CSUWWxi7T7JR/4OGcq0y0E/A\nZt3x4h0zY1+Cj8ZkhWUpL7EjRMFGnIqaZ1DfqyRsL6MKzm9LT4z5kwjZ8kw6\nGfHsFyhe+2rR0RStCPp/qTEo7k436i3mW9wGNkwcbHO9GOVOWl0WW8nBKggX\n1NgwttI7pJNpeb2MODprea8hYVHDjijjf+uVbEZGi6c/CdVgjrViQuuo9Hjn\nfWojk1B3eALnWSVORqJ635teYF7jTlP2hMTIfm0NzochkrQMUlLk6CSoWnv8\ndjvCPBC3meymFtxqwWCer0oAw1uBaPvh+Lc3c03WytXhKtXkbCJSxVjF3+8n\nLlJM9MyCOZ6nk6+XJDleWOs/jH7p8QsPwi26lutfUIgysYcjZRJ/p1sHNyWL\nJntX\r\n=uYcn\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/extension","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","engines":{"vscode":"^1.5.0"},"scripts":{"watch":"gulp watch-extension:merge-conflict","compile":"gulp compile-extension:merge-conflict"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","dependencies":{"vscode-nls":"^4.0.0"},"_hasShrinkwrap":false,"devDependencies":{"@types/node":"^12.11.7"},"activationEvents":["*"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.304fc630f7_1586737531262_0.9448187941400181","host":"s3://npm-registry-packages"}},"0.3.0-next.e6875340b4":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.e6875340b4","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.e6875340b4","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"e2aa0350b5ea171b68606856128b29252a79bbb5","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.e6875340b4.tgz","fileCount":11,"integrity":"sha512-p+MKk20V/e0nkqEGr8mYjNKdQS+HjRy0BFD3OR0+GGULwWazkOF39Q1dcH8YaPenLqGUtSp3LY5wsrQF8GuDMw==","signatures":[{"sig":"MEUCIHet+geZtEOWvV/otWiXBnscxDemOjWJaeXH0eFUgqINAiEAvj/Kq8AAnQkZTide5L42G8uzJDi2Ms+8dsmjj00f8bc=","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":110339,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.4\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJelQOACRA9TVsSAnZWagAAu4EP+wU/j8kEA8AWGr3HvC49\nQqc8KO69yq11himVyK4yPMXDZbZ0BFr60XVlEfHdODApA4pEYMutl3q5bfhn\nuAJ2EyZe9WAIo4Dc94SpgD/yjvZxBXsph9lgOISK8CphZXAQhukARMrUQZyF\nD8754G72mC6Qd05DoT+KO8H+Gkf4G6UaW0sV0wd1S9g8XxjogcYe048oWGvt\nSeUpHBdSzCGf7PV74lsCYhv7HABniqFRVdZx8GrhdTRannaw3UEzUwwQho7L\nmfjbL4piaIej6WgWF+5/+CrtagPc15EpwkmvtnBYBjGCvkkudErHAW7ZlJu2\ne9EYFY7KPrqxXyABxBYbOSB06WjzlpbQry9ynn/FSpSmY//urWTZbWLwA3fe\nOqdDX5WlmIXftLP3xDnMmd++znoxtTBBI5OlP3Cz5kt9rxfINmvluH8zhwPF\nOvo5edPk2lz0+xzTN1c9OdeYM8qGTRKPHG91I4dOTHdqr+OsgTjrhGnwPlxD\nUiIMUELjp2ggn+QOJlDGb5uy0p0wHZv/dIyXH5ZrX3K4o24MObJvskHSImpb\nT0NNOaHl6/IgM8mJasdiXkmuPtJcLwh9Ia/11lkxlGQPF5CSvj8IncuyoVji\nKKgOfyQz/1P1rtTJVkGAl3PvKTd6lRUh2NUopsjl4Fs9uaqXTbONuz1vubxH\n8yin\r\n=dXn2\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/extension","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","engines":{"vscode":"^1.5.0"},"scripts":{"watch":"gulp watch-extension:merge-conflict","compile":"gulp compile-extension:merge-conflict"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","dependencies":{"vscode-nls":"^4.0.0"},"_hasShrinkwrap":false,"devDependencies":{"@types/node":"^12.11.7"},"activationEvents":["*"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.e6875340b4_1586824063514_0.5238811457769634","host":"s3://npm-registry-packages"}},"0.3.0-next.221475ef52":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.221475ef52","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.221475ef52","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"4fcd9422df3f9ca16d42c39d64d6037c6b43e6de","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.221475ef52.tgz","fileCount":11,"integrity":"sha512-7JwTuNAddvX9d8NVPAHoAddKFWqu/yPAwHXv8jhBIgaW7+LtHxH8lE6RVE7KnMJDQo7ycVJmosUWTumVaueF4A==","signatures":[{"sig":"MEQCIHRfIaSgw5gl+D1QuaKb6B+6WkXrt+mIYAp2JPzg6pZLAiAhGmzFZ7fduAQc3Ar8FKh+hwEjh5LlD4plX5kL6feveA==","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":110339,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.4\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJellSECRA9TVsSAnZWagAAHOkP/0iBTqKtDVPbhwMW87dD\nZwRh4JLOnC1SJWG6E5vilmAcvvkJbzyo+7TH6jm8jQa33Gp8sxB0ewA/+b+/\ntB1gds1x6Y5jTGk9JpiryUkAwxVsanlvT028exISgIAKJvy7k2K4wWZgPes2\nTHcHq7K3+I4jc9atZ/yGKMTuWhs8GWIbtzI9GJnSZixC20oNlNT5AwXaOlOj\nyuLRzP6ZaIsVe+lspxFnctwSwwQpScVhC/UAk0Hw4+BrIHva4kkCDHTwXWKV\n2bAX77DwQzifjnb90Bz1z1ilW9PfGUnHTZK8LFVEHlDP14tknZA7OVKQ6IXi\nd7vJ7ExoKu4swFNNmj54139+wy2XjGB8G2XVrhr1+mh6FJO9QivSzperIbu5\nuIGmUvveojRnrN1itbydPZkbco+CzdQ6+KyFtmXTS+vjJVXV3xoroSeJQRWo\nrHwK+CHaM4qR1rTQkcWutJUcUZt9Pq2lE8MBhq9hGDq8qtAi8XKFk5fKl5bB\nTjzbX8G+wYyPfb8oxMK9oBODaf+/JvkaesjYjExl0yUsWHlWjQZuyMHZBeVY\noQ5o/NMAU0khuGw06XRpwIT1gC1Qjyr3NIRjyIfYpZYvdxFQOZyUBi5GaMDr\ntB8Xx9qPtkvivCVunTB+zPj7Y1ZVnsBkHxYPX8mOzYask+0QoIEPZDBLYt9R\nnMRW\r\n=ZQzO\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/extension","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","engines":{"vscode":"^1.5.0"},"scripts":{"watch":"gulp watch-extension:merge-conflict","compile":"gulp compile-extension:merge-conflict"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","dependencies":{"vscode-nls":"^4.0.0"},"_hasShrinkwrap":false,"devDependencies":{"@types/node":"^12.11.7"},"activationEvents":["*"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.221475ef52_1586910339781_0.9267514303769813","host":"s3://npm-registry-packages"}},"0.3.0-next.6903204820":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.6903204820","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.6903204820","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"4c4487b5c14bed8652d49da25da03fb7682d4bac","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.6903204820.tgz","fileCount":11,"integrity":"sha512-M+MehUKNUEWtQqiP3f944IDfEGlqZ4Pw/Hl7ZV+cWQU2IXN5Q+zF71UhRgBzO9uK25Srxu0D9vlnsr8GS8hsqg==","signatures":[{"sig":"MEUCIQDQkGYqs7k48qU3A/boPtHfsuwpYiefuYxRB6azYt+rdAIgAk0y5XrqWZHqXIA8gPSLL6Wu2lpWClxn2wJNXVHpvaA=","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":110339,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.4\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJel6XQCRA9TVsSAnZWagAAE9QP/0An7QuAbSGtTAtxRCeS\nmzicf9UDMmJfFqj+ERITpK56Q8pjl7n0Hei5an3F8yRi6nLnEECdbi28Uv9D\n7nHnO0KUpWVP8sBbuqzKJRxyRv0rgIpeTH9ecw3VANl0PF3EmeQTYLljDATj\n2M4d6y1aCK0/WG/CahLwQkJnc+k/wlq35aWFsPfhKnn+n6NTSoqyFn9/I4Rc\n7h0qkX6cgAIe6oILzqen6VGomHwVlBH3oc1TGvrwJqqhEYy+Y3URjRxY38sx\n81XHtB2V8TSvBqD/09GRj0/UvYFUz6ZoLhm2qNSR90jBwtoNRTPV1tjI4QU4\njTaQtVto8+4mHtJNLW4zQ/7n1moYy+clHae6MbWI3dfUYqBw+ia0qmI0N9Nd\ng9l+J3Y1qRxhLk/5zt3s/70aeivF0euDmmbQWDhVkTVjBV5r8O5MiN6K+Y/r\n2atR+3HHODjtQmJ1M0LY7v0RMBsENTolCeS+x1lGpgGJ1/XMUy3goIGMAlg4\nHkiw1L/QR6Gq4/wII6DXMmgbnkJgUAb+j4Y4rYHLC5AYw09FoUDPbdgPfZT4\nh/ljHqULZRt820kunFPQBTwX747N4xrKuxeIdnxs5Syeg5bed+hVpc5l16hf\nqTHCwau9FDdK1KVQWFB7KEsdjebRz3pVGsrVwdE5ZEE6g0xMHoVjD37r9Pzl\nKb36\r\n=mOY9\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/extension","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","engines":{"vscode":"^1.5.0"},"scripts":{"watch":"gulp watch-extension:merge-conflict","compile":"gulp compile-extension:merge-conflict"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","dependencies":{"vscode-nls":"^4.0.0"},"_hasShrinkwrap":false,"devDependencies":{"@types/node":"^12.11.7"},"activationEvents":["*"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.6903204820_1586996687983_0.09260256011755996","host":"s3://npm-registry-packages"}},"0.3.0-next.7e2e87a813":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.7e2e87a813","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.7e2e87a813","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"600069d253bf8e288922785cbf05f49b92cc88f9","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.7e2e87a813.tgz","fileCount":11,"integrity":"sha512-RhfikNq4WSCBQCCwwtTssSuaVBPk2mG7oLYZ7NyqA9s3k8MoWqXispNfgTUtQXTRb8R44ylDkCc1ZT2cSyZFyQ==","signatures":[{"sig":"MEUCIQCzeqhdmqp6a4VBp6IfBPQVAWsh+/ceIXwAzoOCQzbJQwIgZEvO8VlL3GSA8IdXjS1+r2EYunDL5OAn4kGoxYPWz7w=","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":110339,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.4\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJemki6CRA9TVsSAnZWagAAn58P/1YpbNvhQJ5IviJboqOi\nIRfeOo99xQA13BFwYG1u+hxi6GhQnH4NdKUanpvEB4wxoBcvrXO9cDrY6912\n80dUOzHBWthQKdJeROVJtOJygo6Eh8dUuyH7Xx9nz4a2Sn43zMhtSGOnab+T\nFzljX2rJ5vlDYx5N2OL+Ye/g+YxhbI7xKQoQO3/kzzfFq3nyTBZjtTVQ1dBT\nWoMzyiECVW0GxKFlp3Qro/n6pSWNLHlW/k07oe2YTuTxmYDexVJy/RWzavTc\n807JAHhCbOn+cen10apl4XdtJ5e0kiuebuZCwOQum1B/ylYqgxsO2FDVy2Zl\nZkU6AZLjygBweyie0PlkQbUjSF84vzhOj+bgLOqw77QLaVHSPV3bxUqJdv3B\n+L8Qu8VM1gcvjuYpYnA3tRYr1iJ0UnQeyrEFUrMfmAZY1H1xIWdSzTQuAZQG\nc87SYSRMIjOxWC97Ic8Ykqr4p8gNx1Zu03HWZBs3upxZM6SZxd7FUjwUpQp7\nE61EBH46PZLJXKVCTSC6itkW6dLm1vC7BoRQS03eFK+1KgPAcmEq9YfbdwVv\nJispXOb6Fe/DbWc6qv/aUbs/TXfc/NsznoEPzP0NjDYhVwsh+qf91P9fLI8X\nTsHCNj5VwuN20I0WmDpI3amjxu3fjYZP+JDy/nhiOgP9hJ0PEv87pqGBKjIo\ng3Rs\r\n=Yibz\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/extension","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","engines":{"vscode":"^1.5.0"},"scripts":{"watch":"gulp watch-extension:merge-conflict","compile":"gulp compile-extension:merge-conflict"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","dependencies":{"vscode-nls":"^4.0.0"},"_hasShrinkwrap":false,"devDependencies":{"@types/node":"^12.11.7"},"activationEvents":["*"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.7e2e87a813_1587169465986_0.4221869596945269","host":"s3://npm-registry-packages"}},"0.3.0-next.1c3c0713f0":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.1c3c0713f0","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.1c3c0713f0","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"4def5fa91d2c7095ff97a0d51ca9ea490a07f344","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.1c3c0713f0.tgz","fileCount":11,"integrity":"sha512-2oqOFguR/aBAvC9i3cXTRY8UL5TGNo/tr+veJVe8tCBhwdzhzsjgQh5tV/f4BJV6bW8zumHZ14Ww8GYvS5+VgQ==","signatures":[{"sig":"MEUCICzyc7+k4hJ+lZDrnbvHYGt5+vza7uaq55N41TaqxwhrAiEAxVjCoyuG6kp8HlGhlJkr8OHWctZuQNXRu4rwNGq3GJY=","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":110339,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.4\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJem5oyCRA9TVsSAnZWagAA44YP/jjTeYERQGBXmMD3u6IT\nBHSNn1qtW24NXskbQS1C9Z7oewG41xnToeJvmb0ZzVMPE2bAXJ7xAPGBn7Ha\nyFuUO/QI13BZR0dAmlgTBhY+rykKIzaC14hk7fYMHd4iUit3ShbT3zYYUc2i\nlK0hP72kwNF+/3BjRs3SCYRzbxCTBbTMBBNMJr8DcERT0Ql0yfPMztTe/ZrT\nc0+0A2/ThsBLVv94sCeZ/u9YXKSe/Uterf3qh3BQ955ZyYs6PxkaEGVzTrPx\nJwdYo2r7a9ZaG8atqPeAHvKOwQEXj+u4KcbyNLU6xdP8TWQ5adrF0rhyvRN9\nf7e/7u567m0JkH9xYq6eH3nUGrm3UAPSmhsGj3/D+ym525AHUOIiNGesQKsq\ntsSbpb5yg4XIKHr0Gz+D7Hu+MM2VgsHwlk3fhDLC9Pvcx8j8WbxqwUkuXL7y\nESojfTN59vNYafz7tigUTifLJhZnMrNaxfnJvTyzuxrq3gaT0tU6JE9uNNfL\nux7xpr4O62wRgTsgiKLhz6IHk1V9EtStUQzuXbq0FPdm2KwWydOvr0pm18h8\nrvtNc+SSYyOKY+5bhCgcDgs8n9mUZN7VzkDbQPHibq8FuJFVNdc2cGFO3AUs\nMLCYpY9KvE8Jdjddn6hMOhFD0ZVjVnEp2Q7hRmuQ82YCpeaugzdhUYc9FHsh\ntuf3\r\n=poz4\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/extension","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","engines":{"vscode":"^1.5.0"},"scripts":{"watch":"gulp watch-extension:merge-conflict","compile":"gulp compile-extension:merge-conflict"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","dependencies":{"vscode-nls":"^4.0.0"},"_hasShrinkwrap":false,"devDependencies":{"@types/node":"^12.11.7"},"activationEvents":["*"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.1c3c0713f0_1587255858368_0.8521923513798899","host":"s3://npm-registry-packages"}},"0.3.0-next.ec0d19789f":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.ec0d19789f","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.ec0d19789f","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"64d9d719f108a38f34838605a46a33248fb0b2e9","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.ec0d19789f.tgz","fileCount":11,"integrity":"sha512-CXcrhAXKf/pCzL8cU5ZJb6WFxrS5jvqXgsThvmz1hJ0VlroMTdpPtsQ7SeIHeAEDmaMgEKzswZ3ITd52jSO9Eg==","signatures":[{"sig":"MEQCIFVm99uc2AWdnw7E/MWLaevlug0L60qe+M562jq+KwPUAiAfFUD1GuGOMx4YSja28sqXmTluNBcSSiFG8GF8Wgg5PA==","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":110339,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.4\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJenOu5CRA9TVsSAnZWagAAU9MP/0K/lRFlcGKjJbTJnuIm\neIVgehp/+DLUsKNKzkaXpg/qs/uGnOnG6GD4Z5CP7pw/QT8b4b25klzMX77f\naUBdAWKiOMIuRyvTdqeNCmIl3F6LKwgSGRnc5qY4BvqQrWahcmWU8F44mIls\nPURB0PjhcWD1ugKzsXUPZqYG3Q2fvcCFbU/w8n9dZSTL15RXFvTf1AuXltNP\nJW0t0wqEplzIzaDD0gOj6QjyzLJAx1f7bxgMNgGflzPU7rrOaePAbwk4Sn9E\nEKHmae5OLnX/QAbKbCU9B8AXA3Mc/kuNAAc1A2kRqlFJYVkNgr/2tTbh3fIS\nYEiHtcTlHhMpPIqlozC50MrFA1qZhF1qyOHsWo9GPJbQvaaVrR9yCkq79Hlg\nrEsOwk4utYQZaZx+zjdA7VIDNmWymDQLAXJLVAYCKWOh/rSKnvHMs/YTUhOG\ndybtpTvzE6xjZQVc1S3+yov/fdG66b4LSaz8ScMDMD0doxmPAc/u5KwwUMKM\n9tnZWjx6/i2O9ZuiCB+4n4pzhCsxJxp73TNbXGOy2eZiTCjZHv0Mwxrrw+po\nuitF+wWuP7aYfbD8UtfZ8jgF5DssfZ+5bZOLWKQ7Bx3995pl9riXUjX5k77u\nP+MUEXQnBpjf+eJYPEQgxtYe8wVptr+TWJtoALsBkLUE9wxOpMva6LcRsWzQ\n4JPI\r\n=rB8+\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/extension","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","engines":{"vscode":"^1.5.0"},"scripts":{"watch":"gulp watch-extension:merge-conflict","compile":"gulp compile-extension:merge-conflict"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","dependencies":{"vscode-nls":"^4.0.0"},"_hasShrinkwrap":false,"devDependencies":{"@types/node":"^12.11.7"},"activationEvents":["*"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.ec0d19789f_1587342265014_0.24560050038366144","host":"s3://npm-registry-packages"}},"0.3.0-next.b442c251ac":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.b442c251ac","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.b442c251ac","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"aaa38f4ebb9d981ab43a1f48a45b6e209a875532","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.b442c251ac.tgz","fileCount":11,"integrity":"sha512-nk3sCY6InBQvaZALAdcG3a3Ho5UuXMZkMjWpe8eRLbrOGljudVOLmSkj4Vxn9GlmnSymtyhsLTQu8h33EiaQGQ==","signatures":[{"sig":"MEQCIDZ7RMtpAuRUDakipaxA7RVp7Tur5/7wZQmWpMeNBtGrAiAWTqdwXxo23vmyxHWZlF/bMbw9GiRG7hSbo86gabs26A==","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":110339,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.4\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJenj2MCRA9TVsSAnZWagAAjU4P/16GdQdjRFwb/VxYW9ie\nUn3649Ger8MzeunpJcxqU85A0s/zCqMWkO+GphWT4lpdee9z9xk5BXlFVG5R\nVdqU7NLdArzrxgIlprsBcDPJXhGpkrnlE4UvkhPS3d90per06TMBP9WG21eo\ntYfLbF3P4jCNlOXrpeMxthGixLYK1uJOjFZS4qg/CEhyJNtUkomJVcngZagT\no9dHkIm0Md7pdXavRorpLS3paIGfJDIp8KQATWJpPv2df+r/Lyn0sLSnFbiL\nCd8+FeruOmDFCvjgYkiDRyCAijofFkiJBLHTIa1Ih+XA5/0OZQ0UeI5/xjpG\n45qGcdXD7R8k8+81V4nvjkD6q+V9zUYBWkTgNTkXXCEP++sob1f/JL4utWU+\nWIikRi6qi+w/iVneQ6G2iYY9xPzUcKS8/BruJ9JqPKpteaHLH30HvNG7uTRW\nD/O5aOibw8ynavyzgm4e5SAg6x2jovpDYyxITFDW/qC/qSw5FP070ZQ8sOtg\nuvMcOfm7gmcvverxf9/z7EBClIr2Wb4vOalJklUNxFwWg9vV8PTozFNgqtZ6\nY1BfHBlDKhRPKn4Sls7NJkZk9eLPZRIXdByQ71w7LH5gbuNaS0k8BktKxv9M\nDPpF3Wjobi7/SsQZx//e3R2QF/p5UBAtI0vksrhqUyZAcbhVXQ+fCDFMBcu7\nMmkX\r\n=fuA2\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/extension","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","engines":{"vscode":"^1.5.0"},"scripts":{"watch":"gulp watch-extension:merge-conflict","compile":"gulp compile-extension:merge-conflict"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","dependencies":{"vscode-nls":"^4.0.0"},"_hasShrinkwrap":false,"devDependencies":{"@types/node":"^12.11.7"},"activationEvents":["*"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.b442c251ac_1587428747996_0.9033820975541063","host":"s3://npm-registry-packages"}},"0.3.0-next.647e0beaaf":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.647e0beaaf","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.647e0beaaf","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"a2ab6e7bd1a83e716d7271554e017f0b3cd9e8c5","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.647e0beaaf.tgz","fileCount":11,"integrity":"sha512-VZjIaZCOMEeI1wvoOoBYoli7+cSXVLM0w12v/OYjrpdwWJ9JCJMO95JYS8MWknQsQhSyJE33zkVhDPeeJsNcXQ==","signatures":[{"sig":"MEYCIQCG3C6akmCEZOpo6ydYwg0Pmbnh/fHxRoaQNoiQezTMDQIhAIrj7Lib1MIHXZWasGoqE3NplFccIyJTjf1VdgDuQhxd","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":110339,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.4\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJen47sCRA9TVsSAnZWagAAhyEP/RPBvIOo/kEkYfqWkHf+\npJkmRnHTaUZJaoiHrlkam6en73zMaX21YfDgnB9dS6l9vKfuFt8A91UDpdWC\niUHH3VpanBA8bObaF/Ulf62XkKADKC/SUO/95XNSNtbkwrtIVv8NAy0BiNCn\nSNTB8lXL7oCPfDK59ZD9c3QX0HAH17rs0WLaqsWNLcTZ1fF312SyKXZt7o/t\n2ygzz8aWKlRHylPoZMe+PRxr2MLzgA9YMlXmytjgwATi3FbcZvtIzuWmXpAy\nu0QkUbB0Z4YCPjaJA5Rzd/wQF/acjpYOLW068mWADs+pqaA1AeBbv5lzyOkC\ntahg3+iYCfEue9TXcJdEn2dE7r8Ijl0ZJ+OofqGS5Rq+Xn1+uRSD0Rwy1FX4\nwA5doh8h7BTu7kpgsKQBHD8WU3VMmWXZfx18e3sePqXk9q3Ct3e844NLXtYW\n+0R7phAXwHBvS87FqjfG1kFvVejceEWrcopxy7Ty44nNy2OYCFfJO3rHRB91\nmL29yU1N7GhSDWpRPMqx0Y3RhucQmYX3G3SNFHOrm92opyUsP2sgTaFhQ8WY\ntZIMyCqyNNleIaslY0fFFldafkMdeFpzYdvxuI2WnZ+/BsfqkB622wpI2nBm\nyHFgK5qSIdKQn8125ba74B6DBTyfuQoUw3UFJlGnCgruq0Ec+c8vjWXmt1T/\nNxnp\r\n=Pr2h\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/extension","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","engines":{"vscode":"^1.5.0"},"scripts":{"watch":"gulp watch-extension:merge-conflict","compile":"gulp compile-extension:merge-conflict"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","dependencies":{"vscode-nls":"^4.0.0"},"_hasShrinkwrap":false,"devDependencies":{"@types/node":"^12.11.7"},"activationEvents":["*"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.647e0beaaf_1587515115750_0.8429508842945832","host":"s3://npm-registry-packages"}},"0.3.0-next.c622be7731":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.c622be7731","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.c622be7731","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"7f0bdd6689fee923935a6bcc49aa487d1eabd537","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.c622be7731.tgz","fileCount":11,"integrity":"sha512-zFYXW850V6EHBb8ymQqj07j/t3khBtxRKtKhp82prJRkvJefdVFjShCJG3b/qvYXJnG5pzVBoy4aRrxQSf7AeA==","signatures":[{"sig":"MEUCIHLntFkMV75YrzSFRfmGN0n1jd0vn6jaEL9ZU6HpR5siAiEA/oXzAo9pR28uy5Qs+1OlYe5AYNOLBThqPXIm+1o1a/Y=","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":110339,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.4\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJeoOBACRA9TVsSAnZWagAAPZ8QAIrpTG6A9vAeavEOn8WO\ngC8YJx3y6X4HnUd2b7ADmXTNWd5/gORNxr54kfgKY72UMokGyQ4L6JTV1l+3\n1Wg0d8gC5ZrKpMSeX7Ygiaj2205xAVsoLTy35D5EUP31fV7cUpUnF1Avs++4\nU8IDj2/1gQNWdA4q7UmhN1LxyzJVp0cRnUxqbslIvwMfYrYri1eCfg+RgI75\nibMIbtZislLMEceBvXlnYzQfPIG/1eJUoF0Zy4fDKBqwdd/g0thTpXppsUS6\n4o9joR/FEyO2wWh5Hp3T23Cogq5RHRhvYgy20yd3h8ygvcwwbroT2/B8SyP2\naLatUHyznN+qIpiYiQPLIHC2eotaQ35HWdAOM/m2qEmtVG38AxFXjmMFIg+1\nYUsUbJNNSwfqtJgdJhTNhZD42wK+Ad6drn8D/v9w4lYpzehH9QoqT5ZZzeyL\nZVCvYtrYHBZFG5B3xszW0Jn8oUua+1JhfKzfrmNW2wpO9qwtarDaD2rqEz+8\nZiz9609EP4kYpz4ZgNJ/V4hurZDHmm3LN+oiwhBhyxtqcYjsXuUDBJYY5KXh\nu/SP2z/0oPy70cQ3AGBHScLcI4bNoBRFuS9DddOvIDhd54AnUHNqABfeChsA\nXh+GtxZZSLOpJm98mU2578NOVeiWK5bkmhM56EFQCxm6i+zX/4GKSKQliMKR\npgMA\r\n=MSxa\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/extension","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","engines":{"vscode":"^1.5.0"},"scripts":{"watch":"gulp watch-extension:merge-conflict","compile":"gulp compile-extension:merge-conflict"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","dependencies":{"vscode-nls":"^4.0.0"},"_hasShrinkwrap":false,"devDependencies":{"@types/node":"^12.11.7"},"activationEvents":["*"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.c622be7731_1587601471842_0.5876332735180634","host":"s3://npm-registry-packages"}},"0.3.0-next.6c9398c3ea":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.6c9398c3ea","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.6c9398c3ea","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"00f04737214a8b88cafdaa102122f23eee129b06","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.6c9398c3ea.tgz","fileCount":11,"integrity":"sha512-MW6vyd4Isy8cde1On4t4uxpmoRwrvEm+AW0kLpoTAC7GaX5vy/nsUOzzFUIXwM/q2vGr14DxaP2DV2EeYMe0Qw==","signatures":[{"sig":"MEUCIEBmLNL41Yv4CpiJLTryoONR4FYAyWstU82epbPKr53XAiEAgVGNNutFT92BcbUfKM53dgJoPpdOfpwMfISfZggA7io=","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":110339,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.4\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJeojGrCRA9TVsSAnZWagAAJjIQAIr0skPacMLUt3lc0ZQk\nx0iR6m/wjCF4efZj1lqx6pHPLkoZf9Pf/j0uJKGAz5gaUndw+RoDZR+a+k3i\nhUCIrajHqQ+mE4qkqg1VNP5qU9kXfdYAI6FJ7Nt7lZWsJgsYEmZdIst3xrHl\nNEwD9V+DtmraGsy8bap8UOhcu5OILmtDjvDJ7k3k/cBwxiLtAkr4Df2zozFK\nKHVvrbNL1rAfNbG2wkqmkHPadzZ2PTwwes+mS5aQKsLAyLbJfZCk3M2BZ8Fo\nxNnOKbvZAOPeIOmKoElVmzk1c+O9piOqjEpMms0CFXU8cWyCMyNryYG8p4Lp\nt2mO9uagPSOjs94DQ32C3pVf+NKpsbfO1poT0eoB8bnNfQT9owEjTUy/oGSR\nGgMTCJ+OL4Sgi1KnlAJiL29hQehuSEm5ihZciYtpyktkPcrAFB4RCeBUD2kk\nhF9az2mtQ3Bk5sybun0TRLVPjH8SZvijJek2+DZsLXI4ot2q69617370YsY3\nPYdc5n9Ss6RsxWq7bGzyuZXzSjDJ/avSp4a9BuXw2a1YT9ANklQ2zbfCOPLC\nMkxlklz9gXabyaFDujzTftQYTs4LNErTK7DFGxg4TNaPp6haqf2lWiRNF/UF\nUQkyZnt95CetuYNaJMvkp5bDsldXGWWCzfhnL69ZVDoUKMgfhZmDxVE88+Q2\nCh9h\r\n=xrFL\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/extension","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","engines":{"vscode":"^1.5.0"},"scripts":{"watch":"gulp watch-extension:merge-conflict","compile":"gulp compile-extension:merge-conflict"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","dependencies":{"vscode-nls":"^4.0.0"},"_hasShrinkwrap":false,"devDependencies":{"@types/node":"^12.11.7"},"activationEvents":["*"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.6c9398c3ea_1587687851479_0.6332440051661858","host":"s3://npm-registry-packages"}},"0.3.0-next.7f5bada046":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.7f5bada046","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.7f5bada046","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"75fc28cba34dc07b32287f0e094b8d650341c5df","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.7f5bada046.tgz","fileCount":11,"integrity":"sha512-8570aHklKrhkF+MjCy/GafQvy3tiznZps1M1jk1KRh/7QrT3jJvdYP+4G6Da/YQqe7+cbOYu4kojU4POEIfA+w==","signatures":[{"sig":"MEQCIGQq8tEnv8Eqg+XWWqZU1A4+46hsybCR5Uysb9GLmBJNAiBJUBXWqalMVJo70na/Ml+5ClrlKPRwCIcOdvlOZtuENg==","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":110339,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.4\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJeo4MFCRA9TVsSAnZWagAAV1gQAI7P2pBHu/jToIwajkh2\n32N7QM/5v3aal0Xf5+GY1jalGBr9Wv4FK8DqD8HZNxazxoFAAImV+Kyyg7mh\nvdMv9e5oU+I7u7mq1yKVVaEDvc5vayuKwzNZiqLSTAltumAcb9c4/azF3il9\nX5mUPX/CMyiGQFS4B1m2MY9w6+bcJ90OdsphTnXlSEQfG8mzN+TGRa6lCmNl\noJ8bzMtQ0yki3P7miiZ7zt9Cg/Yf0wtzMpVgdSnXQAt823c8JO6NCb8XPt7g\nDm7npt5qi14zut76Ay8zJOa3nFtYpIdE/ySJXOjQ/icejTTX0sdTCvanj7RP\n+EA+Fig0o7pPcmHrq84Lks035qFC7JY5ci/Yy+i+LsHFIigB7ezp7wH3a85X\nmRhXlaQEM8vvQjO6V0ojFr2SGmknfPZE0FMzCWv+LCNMyLgkp4cq8B3oGkcb\na8FSVBJyo+I2oXngAriqvVb98Xc6Smdcnrc5kswAJzXVq2jRVvAPRk8uOMYF\nRj/hxxlIm9S4aNBeR8XxmW09iC0VNbcLjXI5EBd8oZKAsRW2ZBjQ9wZ1C5Pr\nb73v9v+Jm9CIEYyQqqhCOuG6t/8Ky7ROdhV5JF4gsB0Fd/g7Tk740hE2Auf6\nNEO59BGFBzCGj+24FmSEY/mVM5xXTZkDen70l5r+qa3VPC2LCgHXkMkkBR5I\nGYq5\r\n=v0Mt\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/extension","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","engines":{"vscode":"^1.5.0"},"scripts":{"watch":"gulp watch-extension:merge-conflict","compile":"gulp compile-extension:merge-conflict"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","dependencies":{"vscode-nls":"^4.0.0"},"_hasShrinkwrap":false,"devDependencies":{"@types/node":"^12.11.7"},"activationEvents":["*"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.7f5bada046_1587774213046_0.05751845711527759","host":"s3://npm-registry-packages"}},"0.3.0-next.f74d109a59":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.f74d109a59","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.f74d109a59","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"6925732b7c8876ab0ec59434a00af806d2ff4f81","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.f74d109a59.tgz","fileCount":11,"integrity":"sha512-BLfTpb/mlITc7DKaXKVZrq4ADtNsfoa3hV+l1ClWSq65FqrTk0krFVcV/6mnkJGcs+Ksap32zMpf8F35FDx7gQ==","signatures":[{"sig":"MEYCIQDi6NYZ6jypehzWcHwecsbaxAjkd5q/ZRSf63Byfd2RKAIhAJ/FHYtbf6v2cDfnJn/SegMst5cZz2po6Hbgsk+ZIcyF","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":110339,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.4\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJepNRVCRA9TVsSAnZWagAAhSIP/3aGzuL1zZskPEmWAAkB\nXeoPUMvPP+Q6OVbtWQfDmU7dnnvdySGDrNMadz3J1pzdr5cON6b/6N9DnC1J\nWrncS1Lx69qvNBSvH5fN3NjV3ezgZDNjgXNlIANqX9qIi2GdKqx6jUhoPDcO\nap8KxZ4bpQB91DzvgwreAvy8iyGT+FBuXYBGvo0BiKQjiYnvaVru4U+5yPd3\nB2u9mGXGwwMzOlpsUkm96hU7qgegB+m/2uBaC5bqpI47VvW7LwV7pXDIQvJu\nWoadAThbuLH8tNN28E8iBQzbT9dkcUCcxj/it56+xaH3FLUaWKrWMpxjOKau\novVjasdm/I6AvMNKeL9+sy/1A7Bp3FbBKPqHRFsfHa3yDFFvuKr4wJIOf0vq\nrKW60Gsc/GKcEvTnHHNk0Cw4rAepVnG4t9Hzl8cWZPzp+SKx+5xoPco3ILqS\n9LCiGN9mkjpPE48eKxHIV1lO73So55kuHFci5eEuZJK0v4ZIk6wDjG9qlpsz\nteOMu2EmuShpQ7bnywlZE9px9fO3NpchLx9+CBE2iL5lhhfON2p5Y0eA6yuV\ny11vxOu2j6qtXgtAe4iFH0nifysXEYGgxCPRM0pRlOmdwXX0eK7DV86t2C96\nrecvZRGNOJjJVi2aauQOtOqFEE4yjgW01MSz5Vluy/1+6Ls4rArKre5FfyM9\niVRx\r\n=/pBd\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/extension","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","engines":{"vscode":"^1.5.0"},"scripts":{"watch":"gulp watch-extension:merge-conflict","compile":"gulp compile-extension:merge-conflict"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","dependencies":{"vscode-nls":"^4.0.0"},"_hasShrinkwrap":false,"devDependencies":{"@types/node":"^12.11.7"},"activationEvents":["*"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.f74d109a59_1587860564952_0.4778637353273485","host":"s3://npm-registry-packages"}},"0.3.0-next.d59c4d02c0":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.d59c4d02c0","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.d59c4d02c0","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"c29c061b5fdc1ac67a0067fdb19c9fb848b648ed","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.d59c4d02c0.tgz","fileCount":11,"integrity":"sha512-jwuihuOk1DcxI2BOS7VLGbPqiAUL1puWMgLoPEe3FLiRnfzZlSsyKefQk2M+7Tnh1Eu6Uwfsh4xXCdThCMx2nw==","signatures":[{"sig":"MEUCIF66O6NisBziFhVd9y96IsOBAi4fXGjaDn1oJgWqo+MYAiEAj9C7xM9u7W0JwRVIiMfrM6vBFLR1RISG3ydNpfKJuLI=","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":110339,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.4\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJepiabCRA9TVsSAnZWagAA4ZgP/AoKYzxOk5/bvICwQZ+a\nz1ArAE/jgviMsH6LBqeZI6pbGa+3HRfemCup9SIQv7dnK0iAjxgtFb8xOQt+\nKI3RQljJYTbp0lu3QGWEPIYFA1Jp7jRZ8oBXC9optXJ0oacQ+PiGWJWPN5GJ\no6DrDmeAVRAO0kNtsj7nMZAtEnFVIk/rQLNWZhN94tILrwLtV7MQCJOEqRwY\nGd63yDyVlsYiPVr/pfL4y3Z08k6Zq6M0614FkCwmmTOiSTzEn1/FznFU9Gn1\n93ptmOHRJnz4WGXiieFZYLYLn2LpzTxsjopBWluY2CO05I0R1tHxEtIga6k3\nIGa5U4pXGhZ0N4b7GgKTqcXttzv4LErlxKrVmctkwvLO/j3BDS17q4dwniev\nbD6ZeYcgY3jM05MOJ8cDwDSvDQtSbA7Gs349YbiEWL/3LnakARXJKnR/usQZ\nf0Q11r+5T78piV1YHxOZ9ij8aqTcd4+Zydtba55JqoRT3qBkFVy3I14+kYNk\n41aMI3r5wDMQiRwcFHA08VgLpH5z44sHNztL0vl81WoTsDZO1z87rG0iUC4h\nVqvQPrz+U6YXfRmU+gB7WdLKPpCc42tHBR3OXZJmQDrOO8An3IfYMD4S0Mqa\nmplpXnuCYaPjC3h4/vCPuavfHKEGfEFwxVfcTmwdX30LAjHSpdyOFN2vdmjg\nXyUb\r\n=SA8f\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/extension","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","engines":{"vscode":"^1.5.0"},"scripts":{"watch":"gulp watch-extension:merge-conflict","compile":"gulp compile-extension:merge-conflict"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","dependencies":{"vscode-nls":"^4.0.0"},"_hasShrinkwrap":false,"devDependencies":{"@types/node":"^12.11.7"},"activationEvents":["*"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.d59c4d02c0_1587947163307_0.05316977788315902","host":"s3://npm-registry-packages"}},"0.3.0-next.386c51ddcb":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.386c51ddcb","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.386c51ddcb","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"c49e200dd2b4cf69aa4b2b81357592fda8e79271","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.386c51ddcb.tgz","fileCount":11,"integrity":"sha512-/i/44STzQHKAyp23XUyOYWLdN5ri87LaEAm6ywRuki1SAz0dKGhlUBC9EwPr3Q14/ewTe+15vpexDmA2zc6rOA==","signatures":[{"sig":"MEQCIGvzbEgV1i2EBZagCZJ3czUXhKgVegbVyFQ567uMG6ZTAiBY2PF/1y2ZxzZRlCs9okmiNt3LxTSDsMqh+GjmOkA8bA==","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":110339,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.4\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJeqMk0CRA9TVsSAnZWagAAwbAP/2bDOkjcVIUgF55oR56x\n5+6Uml7wvJTE1KKllKivxaI8Up7rSo0EU/SKDgY0S9IaFAVv6mpFMJoVDo7Y\nxSWHdBmUP4ObdeI5fGwmcgOY2CPC5KSGokYPNbipcNTeDoaJlTVRt3Db6KyT\n1cdyforO+qRwOLoB1CaCH5k8Wb4FK47ljedCscnduH+3MY8Xlsf1uYxeZFNY\nQZi88Arp6X7Q7gI6wFDcf2FKgHxRDvstl0stvFQrDVVFia3lxAtCnw2vhbxP\nlvz0SD68lGrIcg4vdUolVuxeByM6sIoxtbrKYN1hVmZ9do1AxuMmOgBWc08W\nWdKhJnHrVDloEMPp8kSWKT/NKiPbe298b7dKNNyY6cdifhHX3b+tIsy/MtZM\n4VSpKEfCQfuM6r+An4fOtMXF/HnoUbbPbrqzxHV6sQDYLhMvM7hHpamd7qul\nljab3VlC95TFCD/xcly1XeLuFz80ZIQubCQU54h3SCOBHEqRrJTX4hwrtTva\nRMdLRxeFMOM/xGST0AIntlvRsDg8R+wtQrr71EJxkA6Z6Fr+o7QwCox7rz7j\nB376JmPRhKQVzjaMQO78LlqZlvNrq0WyKIJMuLXZ6aVB8YzZM5nO9FGp0MHC\nQ43rmJE+X4bowDMneFon86D3n0hsBtCZ/QG4Y+RbNGrDxirpF6GH35gCzgtU\nvtin\r\n=zCnV\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/extension","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","engines":{"vscode":"^1.5.0"},"scripts":{"watch":"gulp watch-extension:merge-conflict","compile":"gulp compile-extension:merge-conflict"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","dependencies":{"vscode-nls":"^4.0.0"},"_hasShrinkwrap":false,"devDependencies":{"@types/node":"^12.11.7"},"activationEvents":["*"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.386c51ddcb_1588119860426_0.43425436300691067","host":"s3://npm-registry-packages"}},"0.3.0-next.7f6f68aeb0":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.7f6f68aeb0","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.7f6f68aeb0","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"027be92be9ab0febc5f7cf39ea9b7185ba1b1b66","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.7f6f68aeb0.tgz","fileCount":11,"integrity":"sha512-Le88Lhvwug+qFcr7LhX9B5+yejpWBlJxMtCFBdUmkwM4rQnm5+vlwKc3CrVuBvUr5Xh44cCH7SPXdwr+q8jm8A==","signatures":[{"sig":"MEYCIQC+ubiAFAwtRkIiNMtppIeHIziGuo2iG3J6V4il4OpsmQIhAMATLQJk8XqNfXS8MK/0OrvAqbg1IUbdfO/reCBAMCj8","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":110339,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.4\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJeqhryCRA9TVsSAnZWagAA4qwP/AnZI2cHV0j7f84zbTxv\nzX5tI4h4xPqRU4zSGIVPTtcEbOew+67KmRP2dHZ6qefgAXqGwxTWCpQMPO8P\nKySulWFaOELnfX0TNDdkj94JpguRtYRWn8KsYuIO/k1xM+cqsXhAehjEpk2O\n2m+aQTPOrXQ3JYDyUSePu1cqc32a3TGrVWknzsNOFTVsNIHIyeK4iaQy74L8\nf42ecBIw8mNZTachc6psn93Ws5hQwj5yEYus5iy/d1VxDEJkoMkyWwNBL/pJ\nS3Omr8hVRKAoyU9PS/DFQCtVt8T2l5rwRlb6/k4e6vGQCxMI2gGGjxxDXAn2\n81eb9owfapfPNCd3BOs4yiLyypn/g6DbJC/DuhYDmhxomNlN6q70ROK3ORON\neMCk7a7J6SJPvkb+50d7EAiAUVMy4ENhy0GLZY+p8+HXPvR4p+3oujSyowI9\nShFkilxqB/BYeoHSAE2tqzbb3SZYeEX+WVsFjwPyBnRYH0PNlEdWJYZJwDlh\ny6bquu42NO10tfhMLXEf+dXV2c35W5nIOYUbg0d9rWTZqBJ+mm9CRvMEc7kI\nNSyP5RUbidYJNCeKU6bsjxB9vVYtFBC4FRZmXpbllN+vTA3+df2/tOmn0wIz\nCZq5Pxtt22dKLiojb1kfIOZWR1bUtnzhS/fN1BmzGpACMOeZspRPlY/fJGOD\nHHUb\r\n=OL2A\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/extension","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","engines":{"vscode":"^1.5.0"},"scripts":{"watch":"gulp watch-extension:merge-conflict","compile":"gulp compile-extension:merge-conflict"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","dependencies":{"vscode-nls":"^4.0.0"},"_hasShrinkwrap":false,"devDependencies":{"@types/node":"^12.11.7"},"activationEvents":["*"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.7f6f68aeb0_1588206322551_0.9545917818942113","host":"s3://npm-registry-packages"}},"0.3.0-next.d1cd816e33":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.d1cd816e33","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.d1cd816e33","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"d9a134d3424be07c624cfc80f57ece8fdc6c7600","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.d1cd816e33.tgz","fileCount":11,"integrity":"sha512-sp+XF11BtsU6q1H0eGwCPxktidg9pVEHomYcb8K0kKbdOcsckexX7XX8svJ6OJ/A67QJBcRgaAHBEgvzWVbkrQ==","signatures":[{"sig":"MEUCIQDOjSDVXA4j4BPgR/QrPj38n6oeCSYbsdQrnRV9afSaWQIgQ/4APLB/IPWOpjfWmIZtyOKr5d2cNZzUTtSYEHc2xCo=","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":110339,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.4\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJeq2yTCRA9TVsSAnZWagAAlnsP/jGHciYLTZ3/ST64abb1\npcZMo22BgR0bq1FSHsy7sEyvSAbhQWwi7jAGLYUfhGM25nJUoVRUeZGg4rt/\nW2WSYPI/AvsYWGkESp2YeoY3cNZfsAvmUkVnEi/KiLCYcQVnS+e4AxsKmDXR\n7WJeEwz5x9wClMcJumWv8mlABGCD9guXjTJwjvJJSrcN3JRb5Xf2Llm4eB9D\nCrh2xqDLRO4n7md4AY+9WSuzEuhbb0uWZ3II6rod3wyUGl6AhpoxW5nCCcPp\nkI3iLBBicTVvLNqC/Bblk8LfgjpvVi6WdUWACrBxMSG4QOLgAc29LZ9Z9Vq6\nvR8Un1OuTdvnDrxtN3IiP9ur0OTkhQKH4CRYo8K3/W6cA8YijORfj2kk9lW3\n0L7afOURw/dnPEK8C21FfG7djFxDFfJF7/REUWKs3Q/qdzPa/vDf1fAxj15r\njqKe010sbpde1RSAZH/gmFEXavkY1gdnAHDrdkeNiFniEn/5KV3VnUAndOOW\nfoGDH5rRuIJ+xFbquz3Xgx/lM9SlKI1XGuMcZzvDyWFKBi/qibOG3LhZ4sll\nvaltDmXg7wr8+zv0qgGx96u4Dr5Pris44hgWuh5t95NFcDSTqwKGT+lFFtUr\n7JEGEBOgfVRZKmwlJ58PBivQ9jGCWdwpzSVIPtuJjY72Mj8zSzxuKAtbSdkK\nJ1bM\r\n=Dlt2\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/extension","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","engines":{"vscode":"^1.5.0"},"scripts":{"watch":"gulp watch-extension:merge-conflict","compile":"gulp compile-extension:merge-conflict"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","dependencies":{"vscode-nls":"^4.0.0"},"_hasShrinkwrap":false,"devDependencies":{"@types/node":"^12.11.7"},"activationEvents":["*"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.d1cd816e33_1588292754635_0.1606498513640049","host":"s3://npm-registry-packages"}},"0.3.0-next.eee5d36cbf":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.eee5d36cbf","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.eee5d36cbf","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"c7af343f83e3fcda47ebb80b745b5f62a9e77914","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.eee5d36cbf.tgz","fileCount":11,"integrity":"sha512-5dWEbthsO/Yj/m5coEGYtXWXxjhp9LgOeR7cyHV3kELadqjv37GR9BHYi0mfSA6SWamPrHYD0MtPQ71S5Gw8TQ==","signatures":[{"sig":"MEQCIAV44S2GvLkG9ZocIVavpfXmf5Q5GsVLQzGZ6uMPhgsjAiAQl2f67HesH7Fj8co/9aaWPt7qTRc9yIxqF7lBIPDyBA==","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":110339,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.4\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJerL3ECRA9TVsSAnZWagAAFMsP/iaSApSBOsxPTOayya6D\np7qpL3eK5wOqIH4WZ87a2KCW3qTxSUV07UCyWvQ3GzlNQKGXuwx/yfrFuWVz\n5h22+3sNkL9Vj8cdVrSj0VJJ+A2chX9UtEViGJrdGCqx8kwxiDIgz+Zy6PJb\n8bEQMxH8/17e54PBPH1spMubNAjXpqi8z1Emk85V/W0F9nmv0S2W9t+1VKC9\nhyURGO1766cAAwaybUBvI9eJnP7UjkajJH3FdxrlKksY31M/IYlTylERtYae\n6oODtAxo9Gy7WLKOavWIW8Q0RB5Ebyd8YJ9J7HF4cj3HT8ImzDiJ52no+xIp\nOfM21Iunece2mqqr61G1gnxtaT+x0sdC+YWqWUvDTlVmM1Z7icnSDl/ISmIq\n6sTLXvAWj4Upqhpy5hPRxyjvOHPR3mG8GDaCvF9SOsPFSSYVxD8WhwoKJfjN\ni5dOONZ87vycK+KTUDhj5rVNz9AcvfqZW4jwUkB7Ej01FLDk7uDs1Rp2QqGc\nN0zWYndsvfDsQ1fnTrR0asz5oMu2GXgBta9ahP5jnDHIhXwaV485XKUMO2Cp\nNduuoLCCoSi53DVEDsziSkm9Kkd4fyj1IYRqquThY9bXhxHTM67wDjVWxBzU\nm/XZ+kHoHPZpgJG9nI0JnSg5/n7AEkTmcXLinZS4a2O9/vEy/QuobQOJCQZ/\nYn+J\r\n=v46n\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/extension","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","engines":{"vscode":"^1.5.0"},"scripts":{"watch":"gulp watch-extension:merge-conflict","compile":"gulp compile-extension:merge-conflict"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","dependencies":{"vscode-nls":"^4.0.0"},"_hasShrinkwrap":false,"devDependencies":{"@types/node":"^12.11.7"},"activationEvents":["*"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.eee5d36cbf_1588379076227_0.24002477645988418","host":"s3://npm-registry-packages"}},"0.3.0-next.dc348340fd":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.dc348340fd","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.dc348340fd","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"76e93525723863eed2944f3863df9ef08b7e4132","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.dc348340fd.tgz","fileCount":11,"integrity":"sha512-2SV1G3E8UynierB0mzipQ8d5GmIGZeARd+AifriMJftQrNDWI+r/vSAzsoa16DGpByGPwGEBR9WkIKFrRn+zqA==","signatures":[{"sig":"MEYCIQDunynbHgs4VCc5fP017J2FAjoJ+tcAyRkW+OEplrSjUwIhAPXbyQphFaiTlrH97QZSaBgaGOcSE2p9Pzm7YuwzYzDM","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":110339,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.4\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJerg77CRA9TVsSAnZWagAAa04P/jEsCE6jMq8udf03d7dd\nztidG6v2iYoXKZwvpQ8lml/UbfwOQqDs9XhdEG3XHOZPaAbZWoPGTWmWXOA/\nVpb+i7a2s1VB7DIgqmwW6FzEvU2dZZLdjJtKTDV7UfxF8Vb5dmWEPR9FSUON\nA07Xaoxr/3nOKpxmzffpaByVPepkIjYdwUGxBBgc7kh3kuUZtJHj6t5lBQ9j\nDG4RLg9kxUB/M/K2HCfZqCVVDup57OjjNuU+QXckl0lQxnpVGAUsakcpRILu\np5U26uzHHXRmGb40dzCpfA/SJSvpXfujg50E71sJmlsjGRMdi0e2tXsUwdls\nQvy86pE3HTiLMl1h93WDopgXIhVGD4nUDUZsI0wPc/nUxVZDdwaVDKwIAkX2\nTlEmyqzrNLfTGnK8t3CGMXwlTyXpX5pQvqV31nyXvOSEnZXfjmskkwXkVGtc\nmKs22MyKaoAH8r5vpB1dItWBQHPq1RYp9vSguFqf+3zFv2AsFt28g0fo3iWJ\nLzfQ4LBytRU7mfcL05sLwHDiDwoNfZPDTktQUdtpzzx3rOxtIglPxJM9ADM/\n23XT7Fj2+uHEAiYbMTOJTRJqdLBIOMhQQ/3AskYiqpeCT++tD6d9LjC3NK7j\nKu2cF5Mmp/OcvseLjEVm/DCZhz9/tuJej10Hfs3eX0giHmph37+J8h3enOM8\nH4hy\r\n=f7kO\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/extension","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","engines":{"vscode":"^1.5.0"},"scripts":{"watch":"gulp watch-extension:merge-conflict","compile":"gulp compile-extension:merge-conflict"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","dependencies":{"vscode-nls":"^4.0.0"},"_hasShrinkwrap":false,"devDependencies":{"@types/node":"^12.11.7"},"activationEvents":["*"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.dc348340fd_1588465403155_0.5015347604484564","host":"s3://npm-registry-packages"}},"0.3.0-next.b3882f0dfe":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.b3882f0dfe","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.b3882f0dfe","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"387d80b460f0a8d4465f44ce3e0667fcd2cb61a2","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.b3882f0dfe.tgz","fileCount":11,"integrity":"sha512-GgkElotQi0FhJW1qVxaBFr34wO53a3Ok3NxuWgImzTSPArDDEM+EuGwpZuSXh1YFt8isl3zCB93UPuaENyyrWg==","signatures":[{"sig":"MEQCIC6b/Rl8mf4by59oshQcx7KmyMdAO3fJ0x+nNPhZtnUqAiBdql6w6hRS3sm+TreReVdGj+ccdnWUwzPUtNPifH4bDQ==","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":110339,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.4\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJer2CFCRA9TVsSAnZWagAAl+oP/R7pRV7H4jTpyvnO0EZY\n6/gKS7EP4Y86nG0R267hA9aFkTH+syE28LEZD/cL0T6KqTQz7I7W6gIE5aDi\ncMr+iWqqM67oM+qTjja0c7jy/n8+CDn22DetMLI3D/zGaE1GqRR7gUjXsT4i\nLHAULcIvx8/0efLK8hqoQI2f1wt615NcHvJnFE+PDTsWt4MCQnIraaINTzEQ\nvOaf5QyxV5tbY2wlK+XtgX2vh5V25dDld76V3HUWbFZmwQqaf4LOU1Dp9dNJ\nQgq5zFR+bMhBf+sAvwEWgQANL4mVSLklR3WW0483neXLYJR50t6BMAss7v9f\nBUGFbnHF8KJJfOaEOMwIfOCdAq66F5Ic/YW+S84nGQ3gPW46yNirMfl9sH7y\nSXqoaGk0MBBO0E1tqWkc5FsLXqn3ygC62JEDFvktRpLCrloey025unKebbpw\nHw6tx0Resfgqq3WvTQ7fJArZ+rcPt8eT2WX4lAgJLeSYJ2pnT5XjDDUKlg/3\nURK7iXrAmAEOLOPmobvxYra/h+j3Z++jUPmtC/J42+9/nNsv2//ZEP6KDfyJ\nrNVAlwUFGJAtMbpBX6mSwRZ21OCg9s0PskfuKR/d6KI99adJPq77AcpSCj9F\nYT0U020FvFyAwrGdjDW2wwoWkt3B8CkfVEpJIu9UwJXv/2kpjFWrUdcTCFC5\nRkx9\r\n=5xru\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/extension","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","engines":{"vscode":"^1.5.0"},"scripts":{"watch":"gulp watch-extension:merge-conflict","compile":"gulp compile-extension:merge-conflict"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","dependencies":{"vscode-nls":"^4.0.0"},"_hasShrinkwrap":false,"devDependencies":{"@types/node":"^12.11.7"},"activationEvents":["*"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.b3882f0dfe_1588551812629_0.30476179589305397","host":"s3://npm-registry-packages"}},"0.3.0-next.0838431da9":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.0838431da9","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.0838431da9","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"e3b7ee9b7c636f769bb05b113099532beda1679e","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.0838431da9.tgz","fileCount":11,"integrity":"sha512-kdV1uUQ8vUpfRcwsSkLCnhWobd+wAflnunz8r+hxjSF92H2MwuS/HesRgvqAKUTkJviGixrTvlaQwb7swiq6cg==","signatures":[{"sig":"MEUCIHhyAnfHJW4Gyt/Q7tZx69XUnT2E8cPt6bJteJuy5/XaAiEAmtNLzUuNr69HxEfckXmVHX9d/SjQOhfKEYZVal9hrPo=","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":110339,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.4\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJesgQVCRA9TVsSAnZWagAAFB4QAJ7/eCP2CuDrYgzrax7K\nFtsmLhaXXJlFuExhM2WYopSfc6R/7/X+rnPbM52c7BGHpu3a4qNOxb+k8HVN\n31lXkmU+kiyQrmuyDUgwZ+NBRtuDuUZg00ljO7ipYRoSW3VO7QaMDq6SF5qK\np7VZFNltNylJRm490lrzQy9tkU2AVNuUPAAOymaXKVcMOEXUaElLqdldelez\nGS3zDTxitse817Wn/qd7+biqEpBlsPlvAa0vuYbZqGmOdFbE8M1K7Wm0z8Hb\nr62sR2vp+8YTRMpbXPZuaUAAt3gAB/mJsIx/JBjzy6OD+OiOxJxClbYuHm/m\n4gdKA1SsBLCnxQ1PG7SoSYseKtxBA2GpJAwnpeehSWSryDUn5iuT82DWALRM\n7Hk/6fcSB4xjTNYRq6WE1E7kWzaT7IyTk3k+m9fAtrQjEqnRxmSyT0CRs/8Q\n6m/cs7BFEkzrt1ZiQ9DrCvNGRkYHZbmW7yxtuUNRw4hz7QPVdIexu1k8Tx7N\nLpvh9sKv9WN8pt0Jg7lEq1Y5f8zoHszVs4xYPT8A7yPHg3Eg4kxIYu0KFk2q\nXL7K/9auD+KXInxAyw74GILjBNL4EHMD0aK+bp7UvAjb5BqjXouNiVj0y4jQ\nOyhVyN3ZSVDugcE33Vg4ULGJQE0PIF/W7S0GFhDdOKjUT2nIlfpmUzRUwEpM\nGTrf\r\n=LXRv\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/extension","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","engines":{"vscode":"^1.5.0"},"scripts":{"watch":"gulp watch-extension:merge-conflict","compile":"gulp compile-extension:merge-conflict"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","dependencies":{"vscode-nls":"^4.0.0"},"_hasShrinkwrap":false,"devDependencies":{"@types/node":"^12.11.7"},"activationEvents":["*"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.0838431da9_1588724757047_0.8806083969353045","host":"s3://npm-registry-packages"}},"0.3.0-next.03b322ec44":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.03b322ec44","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.03b322ec44","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"c71e6a15910445d514e72760d5fd8cd9247a9da2","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.03b322ec44.tgz","fileCount":11,"integrity":"sha512-hHhWc1k0ZHkGnO4lHS7m8HiHgH0kxcht2NT2DikQnEmIWJlteEqnH4hXVS7O3egE4gKzAGQvScXoFcydwAxKMg==","signatures":[{"sig":"MEUCIQDRqFz2PAbqMRrTwZdaC7j4BHcZz30Nln9arr0IhrJD/wIgIoZhV2swG3TgXFDrAND6s8iXbiJxxzA0KVJvXrT/Pp4=","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":110339,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.4\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJes1WUCRA9TVsSAnZWagAAEAQP/RYOeuP8u+kFjw4YaXka\nPnkWf9MTPwtvw9RxDOs2mlsz2sJrXz/laPUlugxEJDlt53BMg7V8U7f8DUkK\nFCBgQvYH/36flnHMN3KOpQM4Iz0ptXdaIAfNGsT2FwlYOdVNiaKEGVZiH9TR\nFv58xrbMRiLEQZsBxmiTzWfmhxIQaKlM+s6YXx2iDIVWMQvHJae96VNciUUw\nBG26IXeW/JUlbyJs6obFii3Ew6HG1u/ygqZvj0Ew2f0kT+aqLlppFagRwfZ3\nGEJ8eiuscQ8khbiikGx/FuUJ2CDD4SzfUbVGE8EXDVKLhLsuEwQtMQ1Nolh7\n0uWGTyM8l01aEx6MWHH3xXqo6tZ9/jBY6IgUkPy5cOQDVWlJMS/gWe+vF5pZ\n1gunPHYcrEtOe7FmprBwHb8MnE8wQfYJ2x4dELYO0wM0gihfX2JQ5d5x7VdA\ntCc9BBknVA0BmwK5CtE7TD6P7wH3faK4LoKqcsHefM0NZiZJDrRKyF6S1i55\ns/ayf9m9gb9ythJBKOpQHuAdin3wDKszWXb9lipEPm46EWwtH54nyrP8KHav\nUz8L9zDpXygvgAC61nI2cRNQWicJ+mtDqiE53gYBlJ0R3ctVZ0+HFFO1TnEW\nh8DrWgd7K89jYTsXMbgwiGKrLqagPeglNenUNp/V8CaDyffeGPUCRbazlvKI\nqiOJ\r\n=l4Mc\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/extension","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","engines":{"vscode":"^1.5.0"},"scripts":{"watch":"gulp watch-extension:merge-conflict","compile":"gulp compile-extension:merge-conflict"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","dependencies":{"vscode-nls":"^4.0.0"},"_hasShrinkwrap":false,"devDependencies":{"@types/node":"^12.11.7"},"activationEvents":["*"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.03b322ec44_1588811155780_0.20354481249837963","host":"s3://npm-registry-packages"}},"0.3.0-next.027b6b709c":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.027b6b709c","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.027b6b709c","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"978f4b11a67d0545eca6f8aeca3a24aa47ab5882","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.027b6b709c.tgz","fileCount":11,"integrity":"sha512-A7QDe+73YQ6nWjwSHlCF397HiYM54LQOvRLDYCWBbMErKw9TCJkP8oVGg9XazfwsdpcL0X9s+FfFYvifJoY7iQ==","signatures":[{"sig":"MEUCIQD+22B/WJrlgBlqhX4BZl3wCvhTagaSHcemE6s8nvPXgAIgMpZujsSfJndEq7QXiwLx7iG8HXHAhFt2IYzGWPNzJPY=","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":110339,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.4\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJetKbdCRA9TVsSAnZWagAADqAP/A23BifYNI10YjDigH7H\niSpsbC9JLFZU0V5xSPAdBvx/PIxaWhnqsjGbS9tUurXLV78kX5ydfDOSHWeU\nhPiqWaeM4X+yQlrwSjr//ujWId2cyFbdBfzJAbs98+xCwe3J4G4CvSVEj1iA\nGgCG7B73G9F6bcpgkL0iwTf91vfexg1z7uAUdNGwBjxR7Gqx5ESYy8BAE/vs\nrC1/5hI4dSVgrImNW01hGqT6bagZ79AIUM1L88gHcdd5VsiTByW7cDKyePp1\nGfU1N8rd07y2s2Yr6MZbWUiSmx36K3J7AJ4HVb+5nKCbqjjB8X4N8WlguQDV\nePvsQ875c9quWSKkuD8aqNgCv9H6VuVR7TfQckXKB40WmMaMl7U59+DtF4tn\nglAhjjOcVkwcnVoRtVb9GTjy0KNrdtzUaa0x0gCTV/fD2AW+lvIC7p1RpXIi\nDVY2B7gT19j1vW841c6yGrrKi8eDllQl68ang+B8PPQw59DJsxmBP74ct9eT\nwxVX2nDzF+8w7cp01mDkgbM3QUeOm+J4ESp1k+rFFH3PRyx7VrcfkDqv0xbk\nbxCXZYiDYzzlAEaFuZD8lyeCQQTb3i9egz2mqizOuCGCWu1zS9NhCCyKWCX3\nK8jAi1SrroKuLNDKhsjMOQDbXWXMfklJmocutq3k2EaUpk0FwbO+zevjo1MH\nd6RE\r\n=xn3A\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/extension","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","engines":{"vscode":"^1.5.0"},"scripts":{"watch":"gulp watch-extension:merge-conflict","compile":"gulp compile-extension:merge-conflict"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","dependencies":{"vscode-nls":"^4.0.0"},"_hasShrinkwrap":false,"devDependencies":{"@types/node":"^12.11.7"},"activationEvents":["*"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.027b6b709c_1588897500993_0.28135801190613496","host":"s3://npm-registry-packages"}},"0.3.0-next.306235b1e6":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.306235b1e6","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.306235b1e6","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"a0e2de81000c4c47768e8ee7055ac738e277004c","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.306235b1e6.tgz","fileCount":11,"integrity":"sha512-Z21r9b0w5AV6B7LG6jouvR4lwIWkr6eQLGsErFppIAXKVOVJkpeiprCNsJmN+lTlUjelmcqnnaW0D4tUAfOl4g==","signatures":[{"sig":"MEYCIQDIRlhQknNP3UlJKgQYd2H49bEgHhcfpL64HyRpKTxGVAIhAOXKp6VRqpmlGNSdq5xw0DhNcvaFLHWAiDkm/aypp09W","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":110339,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.4\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJetfg2CRA9TVsSAnZWagAAuYIP/2o7lkr6CK6dy754jMwk\nuV5jNRFSaimbrDiCcovM87HPsWL/DBUjkHpXFrAhV95OdSDI5rpg6ryzKs+G\n7ZhmQCX5lRV7cwy1vnrJrNSzaK8f5BOkz1aMndIwWTrXT+WfGhA3xsoXGA9P\nNx29AOqpNhM/aA55LMgVa+HqSdNauV5ULeEXG/4gdrLtBxwqEtYw+VoAUF2+\nMzKHBX9poS/UYc3xqbiP/B29rrAArlro3Wc3bPFKuQJUlZiQ8iIeIr884KUY\nQ496vPloULWxYYjMt2/3MfoclElFJ0tjE+sjuITEeT1bWnhctetpJmZSVlqe\nhV01nRjvSWAi7yrpY0JhqMVLfNU8BNEASXRxhXCkimwevi4qTmqMuhmfFtBK\nm8IaasofJKmWUN4u0YicD8kNFeQX6nWtqosNPL66tmwbHJxwicKOYRuKvtdy\n6MCIf6kJKJqDjMEBpcrazrrTLVUAPeFufP1P1v/6/H7PnR2L1LU5b5nhWYRI\nMu+WG6ZeqLAHFS8qGdRqqiYnYzTx1MmXiyoGKvg+W3RvJfM1GHF3tlJxj2+Q\nv1s8GTZw1yPG4OUamxrmvk80dHVYGyY1zQGnCLBQJ74uRTx9lh5DdsxwQmCF\neLNVOeJr4cPtsEGoQoX3KjHLuvm0rWXTVMtZTJSwfNUYMcBbT6nanVwtdTrW\nMvaG\r\n=PF6r\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/extension","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","engines":{"vscode":"^1.5.0"},"scripts":{"watch":"gulp watch-extension:merge-conflict","compile":"gulp compile-extension:merge-conflict"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","dependencies":{"vscode-nls":"^4.0.0"},"_hasShrinkwrap":false,"devDependencies":{"@types/node":"^12.11.7"},"activationEvents":["*"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.306235b1e6_1588983862018_0.9493527451207351","host":"s3://npm-registry-packages"}},"0.3.0-next.ba33738bb3":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.ba33738bb3","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.ba33738bb3","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"5781e1f7e69a24c61236a40faa092f09a6472475","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.ba33738bb3.tgz","fileCount":11,"integrity":"sha512-HNi4aoZChP+EPRdPDHZju3lZefHqrvdrtTupKmunVX/IQVT/otdt85e+hc+2kBE+HkF+nqE7iUA33CzlqWf5Ew==","signatures":[{"sig":"MEUCIQCCik/dcEOUUAM/fGnYugC+0hy5iNgs7S99savxnKTQMgIgEzhn6yd4ZLzdvmep79AY57G1Sf1N23gecPw95/Z9lEc=","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":110339,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.4\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJeuJuWCRA9TVsSAnZWagAASSoP/0oocEhxRdv9Nys8+344\nzfS2/UrAxU4JPh9+G/9fIf6Y6wX92H8R3iZUL6sBv01hlcwz+gr0d076ZzrN\nrG+Huhmc+0QGqudKv0d2OeMV1vrGJq2nWlkEBPcLiX02LLcQWPktu/u3yZO3\nUU7llC9SBd1U5FkmpgQakQbyQpLmISbymzqPaRLwHJfwt92M40nkRkOKDm0f\ncN57/CPHFVH5NHnSuiB08fHD0tdI+Ub1/do0UZkJZ0IOZTI7OcWU50RkgCXX\ntu+2qpl5gNy293pbnt1dTiiwYBd3eWPicRiITnMVeDXQHX/2sSmYTvKSfB5P\nfkDuWqI/7nuUWZ4CU2V8N2O1Pg8LVjUj/zk4ehnsKc4z4ORtNUe9u1JE9bY5\n96fY4wUe5enMo9Df2t3f4ua/MKZr9OlIbkoLHJ2YWgoN9E7lmOAXmQ/jXzgn\nuQieAS78YvNPve8oFpxzgKATuV8cgjvZfvpxxFxPP+9RSH36ibmgO8y2eYlu\nzxcdnOQJTwtV4FqrZIruPHTYepbK6FYLaRzcgA3Qr47iE8ox6v0ymQBuNPPD\nGJ8E+Eih4HtMbxwUDUvDdXU+BtzP+jIRtSCi2gXcoZKQf8mC3CjENt3hkTFq\nbjzFY9mZPRAO8Z9UAHTZBuI0Ozr9uL1O5fVMlCetxRaHWQ85gVfn4fE2PdkC\nSgZS\r\n=ZCz4\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/extension","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","engines":{"vscode":"^1.5.0"},"scripts":{"watch":"gulp watch-extension:merge-conflict","compile":"gulp compile-extension:merge-conflict"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","dependencies":{"vscode-nls":"^4.0.0"},"_hasShrinkwrap":false,"devDependencies":{"@types/node":"^12.11.7"},"activationEvents":["*"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.ba33738bb3_1589156758292_0.14916272828280563","host":"s3://npm-registry-packages"}},"0.3.0-next.5aa5fa5f4c":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.5aa5fa5f4c","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.5aa5fa5f4c","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"f92259b94744db41d21fac23458bd3dd98561b79","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.5aa5fa5f4c.tgz","fileCount":11,"integrity":"sha512-n5Gow+2BO/oX9acSg+xFXBPcaV5akp7yed53vBlhzN8Ci0zI0Ugnok3C6c6wFSAY+jrfY3ibDb3siW1uNTL+kw==","signatures":[{"sig":"MEUCIQCKHDoMDrENOKDFcEptDhDXemYSSH8LZGxsGyTJNoEjhgIgZcND1HDFg3S7T4kkbOjpdrcp382Kvb6QgFESUelnmzs=","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":110339,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.4\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJeucRHCRA9TVsSAnZWagAAovsP/i/oQlI5dEfjy0VsgADV\nDVN0O1u+f1leK/LMFe18wmn8nPZ5MhwzXKX9KD5xUCkf029SKE5KpdXHVXkO\n+fZiBOqqr4PvWZNZTtPReMW3haqUb3F+2+p8OnUV+mxWqhIGbKuId1f5Vyg1\nkzIxpZ/EKLxB10ou6mx38JVBl7Znz8k61L1lEQzhAc0xqQGhv06FSNFXbJrt\nuCUCMtSxgvIoI8JcaemDZtaYP2J+9m4cnmQh7ALKYz5O/4oU/losipj+gvQF\nfxN148WOZtV8XpoEiC3H8ccOn39nSqHYvw+4gh49IH3CBFjPUscYulRLEDVr\niwZOTFAJhxA5/MMnTAXjVzAvnBQaB2ditPJUeKYj/9yo8W9Xbatt3oc8G1kF\nXXBQKUwfILfLmKHEJFVevRP7pCSQEB21CzXLSH5MKWkQWEfTmIUmVRRD2shm\nosOX3k44+SOYYMR6ixYWam+uRMaoYV+Ql9X3zay34ImQG5X74miiJap5SQLA\nyuCWZO9+Ff73NrAOZHbxa9UyiKRodusEvkUWYtKmDwKaGMCos7MDhh2CWCwv\nDLmbG+T816YBo/p4RVRee/S9vjHjkmmasOS22oXiDAbIwiCS2RuHM3OO2nMp\nr94PHroS+JK5VHiUKKWA5uXRiMEhSGvl/SPClXOmdx55Pk2VMAMyZT96mIOg\nOrrd\r\n=E0xe\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/extension","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","engines":{"vscode":"^1.5.0"},"scripts":{"watch":"gulp watch-extension:merge-conflict","compile":"gulp compile-extension:merge-conflict"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","dependencies":{"vscode-nls":"^4.0.0"},"_hasShrinkwrap":false,"devDependencies":{"@types/node":"^12.11.7"},"activationEvents":["*"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.5aa5fa5f4c_1589232710777_0.03363619710336252","host":"s3://npm-registry-packages"}},"0.3.0-next.6b4258e724":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.6b4258e724","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.6b4258e724","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"b2c196e29be8c1e9e50861874d5edcf984251690","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.6b4258e724.tgz","fileCount":11,"integrity":"sha512-MvJl2S4uTAsbeothc13gPLvV4wJSBfRFCHP3YPHdGO5roEZtWrdMneBa6TRX3h0PzCHVUdk9B8cR0bGc8cXSSQ==","signatures":[{"sig":"MEYCIQCdI0Q0+dECvbhoZ5p4nBGi+H1g3TPP/2hv+rfwUAlPtgIhALsn3w6lVEKDu5xAB7FH4qtf2TIkq2GjKBmYvadkVyYj","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":110339,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.4\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJeue1lCRA9TVsSAnZWagAAbuIP/RMKde4qKtP8S0UwFIOk\n0MnSH8bK6/iuSJ9KIQk+oDVQFVbsH6lO+1S8/JsTwuoy6Li1mgdkRkFrY4Us\nWAa8hmyc5FqoomhviJGOgKWWnF91JeyR12xfT+afUqfU+pCjTxUaIqEsELqR\nCxaDp+5iuyNz/1xtK4GxaSbJg/r1+YjsQyY1EFm/yX8N5K4PRH8rPV9F1JAm\nMXWp882h/y3R9Nix6eqp50093Lm3W4CuStfWlsdMr7IdZ+VSl6AjdjcOdpm+\naEo1+h0YrESeMh5xj5QeVe083b1kgLbC+UOCJBHwBBJj1FKrDb5q9VGOUp9Y\n4T9WSxYBXop/xe5KCmfe62yzkfOKPAR00Fi6lpGgB+c/iV5hJz818B3yvZyW\nEuEt6Yo8LLyKM80hXTH6haSEWkktp9pGHmEmdkwbzFx4OVLR3WcIXpjx6G3s\nOS9abqGhlGUtBmesIgMOgDWJsnDsliA/YTXobwiC09WYVfkDj4INhOkUYHmE\nXFI2sp2OVug03JE3+S4vLSAwjyHDQHxyj7E5wjuGlB02rb15Unc91aAfPK7w\nZ1gzzp2FVDU0sE5Ox3EMcGum2MfAOv5UkYnwcTpJ3hfU6HOnZB+X2dEMx0/O\nsZUs3ukjpRcoLsHjokIwkYqSc3nR6CY5uqNFWpSBAa4R6Ssq2piM+cxWYF7T\n+MMa\r\n=RZ3C\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/extension","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","engines":{"vscode":"^1.5.0"},"scripts":{"watch":"gulp watch-extension:merge-conflict","compile":"gulp compile-extension:merge-conflict"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","dependencies":{"vscode-nls":"^4.0.0"},"_hasShrinkwrap":false,"devDependencies":{"@types/node":"^12.11.7"},"activationEvents":["*"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.6b4258e724_1589243237279_0.5308266352885134","host":"s3://npm-registry-packages"}},"0.3.0-next.8ad9d82890":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.8ad9d82890","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.8ad9d82890","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"24cbaddd0c2c203bd76c871d7f2b063485ed02e5","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.8ad9d82890.tgz","fileCount":11,"integrity":"sha512-yrFtdNGtL7KLMx8Bv0PUDDNiUftrxyGw63ql5ysXMIJXeCNSCCAa3LFz0qXldKBhS2gayy1KcRqaCLYAQeP9nw==","signatures":[{"sig":"MEUCIQDcMqAtB1T80Yr51MpZLgeSJjZVVakMkF2O5fo2xlkefAIgUD6tA9gAGutlSZmhB1m6CGRUKmdmTO2isVGY4fMEy8g=","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":110339,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.4\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJeuz8dCRA9TVsSAnZWagAApvoQAJ0kDOYJZkeTxPBus7jm\n0tb0oRVNRczcFjOKiNeCIfy8CYoF8SLHdP/I+GZCgQaka+M7BxvlEX/1R030\nA2JvEMyO8MKFw2FJma+XwL9BIQV/+weRZNyOJW5kiridnAA3kFRCZHQT8eXg\nhUO6LPqJWg73Swf9Ce2AF8mgyWe7lVGatZgU9HH5wGn6TMvtqNPRPfQqZT64\nGG4h5yWkwke1DuJJZsM8jD/xXJ8/htV6Am9FUn5eduCRXKvpUUIsSlFJ4o5s\nj3wfp0HTHj0zmqL8dvHIPhW2HxccpNkuDN70i4JnMC0i2EvvO2HhjtJGdW4n\ns032GTWl02XwI+JtZonO89l3A4h19S5tkRlpWk3NffGYbSaEmGzeLZDdhw1+\nKQmVnxjd+wVbxSq/sIuIObaYmsE8PVC+MVrVvrKjG8W0TVhD1CV4D2DgpZRW\neT/rRaAeD+N+sSIIgbDAh0vD4BwbqvqWEsdyD1unHbSD3T6dGecNScPr5mo+\nFGAct/7WVFNgbFfhpapv26KHR04iLmKZkfCkOCnTmbie+QF3QYx7XQsT6xKB\nyMEcip39AB9L/LQjT2rJ6Tqugf1Ju4AciOmeaMHJGYbOeAsTQu3i5iyPjOfd\nhzeqcVBhHtKzQWgqVoWsJr/rw6CJ5876P1PagSjP7U5TF0ouGRy20M8tG4rD\ncvvR\r\n=AuaR\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/extension","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","engines":{"vscode":"^1.5.0"},"scripts":{"watch":"gulp watch-extension:merge-conflict","compile":"gulp compile-extension:merge-conflict"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","dependencies":{"vscode-nls":"^4.0.0"},"_hasShrinkwrap":false,"devDependencies":{"@types/node":"^12.11.7"},"activationEvents":["*"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.8ad9d82890_1589329693235_0.9097321580621762","host":"s3://npm-registry-packages"}},"0.3.0-next.c175ca1129":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.c175ca1129","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.c175ca1129","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"4481758839c25c1793670fba1e6fb9b02eb5963d","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.c175ca1129.tgz","fileCount":11,"integrity":"sha512-R6PFnm2HHhuiiya/Zouibwladv/7LNZGHUrwiEuBtFbz4Zy4YSjFkscfXn81TiFoLG+AtPT09znyW6RXRb/67w==","signatures":[{"sig":"MEUCIGr5lnUvUrGrukBZ1ErRVnXpyh6flXt4eXJp9WZL5GN7AiEA9jlbphclftxBG1RE9okWwFe8K74XhvnU4il7IH49WL8=","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":110339,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.4\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJevJB1CRA9TVsSAnZWagAAKpMQAJ1TD6YmmUKGoIJaKri6\nHu+gvyNp9C7RCHsF3Bxt/uWmFrlwWYpCfkr8pgmaIBwR9BfRzQaorJKuDwwM\nZZoU/m/aNd6fY97krAoidYOG7spbpLEhAbmCbeV23Ka8+JrMQTE8PKpDWmIt\nWTI5TZciSL2MRjfEotkuG1/5b29WyUbBtX1GAcumtbXqlhy96IZ65qDjq0YA\nlfG8jWjA9qvdnyKVcdepGEJ6hqS8jd+9TZCBaYcljhe4Zf83Rzw5XS+4Tbbz\nVNhZVXmEgE1dlLhIhd35n6YFgqv13J/CUfAgJDOqEuTkeYcSqKeo2HNZx+/3\nFXEFdsrstQ/PndYzvRUn19baPu0lzw+6EyO2aK2mZOskjTkz5eWqvqJYW/QD\nxm3eeplHylppYYmKRCYx8kA5IdE5Ug0I+CoITPlJUKCst+wokJSeDL5t8y/A\n0gMZzYp8DNGJnG3CMnVwFWu6x2vVh1HRAdDQj0nr4B+YTKGo+QKDWRPosgng\nwi1//+vbTLX0f27DThVbTngw2OL3j0Zsh3OldeJNlKLXNQsmQmwgaopiRjDq\nQgwfw0Acef/fWxxUTk5jrmDQoxKSmNPin0VYFqDDpylggKNXMbYmOicCxY11\nIWCFRRcdVo1+vDiHcf9d6KMYlFKbQ0b46t0lXbv49pOpXSA7Wc4f/9TRtaCY\nHfqH\r\n=mCF5\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/extension","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","engines":{"vscode":"^1.5.0"},"scripts":{"watch":"gulp watch-extension:merge-conflict","compile":"gulp compile-extension:merge-conflict"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","dependencies":{"vscode-nls":"^4.0.0"},"_hasShrinkwrap":false,"devDependencies":{"@types/node":"^12.11.7"},"activationEvents":["*"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.c175ca1129_1589416053111_0.03224569906382868","host":"s3://npm-registry-packages"}},"0.3.0-next.d40066d9cd":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.d40066d9cd","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.d40066d9cd","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"a110e735a38a098aa0463037578a9b681d436061","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.d40066d9cd.tgz","fileCount":12,"integrity":"sha512-8Gd7HzR9v5IPg8sHJ9wNeivVyQEkLy5w1fo/7MYNhXDtyzPfc1s+f13PYmJlgJ5QUxEvhNHoXydgc0Q1sdecNw==","signatures":[{"sig":"MEUCIHnnuVivc68SMGUVaHr46hfwRRnDphbWhY/t8XLZKcUmAiEAhjIyut27PBtpQcBP9xpcQzE1WaXH1C1j+kzsl2sgzts=","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":110625,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.4\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJevdbxCRA9TVsSAnZWagAANQwP/iv7kXw7Njn4oM+P7kiD\nt0X3P4cN0Wzw1iYgydXixDR3xJilpkj3JcgJIRSa+8ju3iZpYyxNw+ENQ6uT\nva7WJON95955FKd3i5sNOinnHEnDSIVIVU2PcTwzg2pIjlbKVrpyX/o25fDJ\npEFbHaLF8rbhqSfuU/BmDd/PNJvC7PBuaSgGb8iG7nSh1N0lekYztk6HST5w\nQ2VXpUqM68YK3ePtFaGk68QHGNnKtv8fq0TrvoYcg0JG4Sn0Ir9669Zc6zCE\nRDDtII6ecT1vOJx5WVtlM53qNsftAu0juMg6UxZz+FvIv2Qf40RBK7NM7YTL\n8Y3MUMXp6LBZgCkrFaaLB8Z5R8xcr0xOGoqlzFT7Xrmu3xMLENZLtHria96J\nL/1Nd0ByPeOy9T7HBt9AleIvh7WegvTliIJgq0t0f6AH7Cln5QKGijOGQCDG\nF9GeyAIZHCG3XVVsxgFySGjwcZT6l2lQVjZMnMS8xyZuRf6PxvhgipP+uWe+\nMNsPmvEXzWbfF4/R/RKYj1+j61DEFY7jU6Wf9oLHhU0Xr00UCIPN5zeaq2l7\nLb1PcQXbFhbK2MF0P2vhIRkSGsvvgDwcrjeUHd+M+1NSePMonjRLkg9ogQzC\n6rX9TrVa68XBpoYu7DzA3+iAb7z5Ft6q7s1qneqnQxX35cP63gCaWO7yEl6c\nwd8p\r\n=CDC3\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/extension","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","engines":{"vscode":"^1.5.0"},"scripts":{"watch":"gulp watch-extension:merge-conflict","compile":"gulp compile-extension:merge-conflict"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","dependencies":{"vscode-nls":"^4.0.0"},"_hasShrinkwrap":false,"readmeFilename":"README.md","devDependencies":{"@types/node":"^12.11.7"},"activationEvents":["*"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.d40066d9cd_1589499633000_0.3539229454660002","host":"s3://npm-registry-packages"}},"0.3.0-next.48539eea8b":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.48539eea8b","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.48539eea8b","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"0f0f185f38757a4c41596cf888bcc6601a5c7335","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.48539eea8b.tgz","fileCount":12,"integrity":"sha512-rhQBu8lq4+9XY+u03TbIInXmD9nbHlkuMHYP4mqwTJEk+t3e1WHfR09bUSWhg413GD+zXhlCnmgKdFCSJTxouA==","signatures":[{"sig":"MEYCIQDves1yku5ZVsyU5MDhUlyrXcCRP8hy7Z0wK2RTbHHjSgIhAOx3J3SiLyEDTk/IvLZDCkXlOhHNGiIjygO2j+x8KAbu","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":110625,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.4\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJeveGFCRA9TVsSAnZWagAAjsgP/jesrQtXhcuXESF/LJ2R\nA4wXIZWUQj0eB6NtUeL12j2g/HkSb7Xs50q9vdwCsn6Aye/5dzn8ktG9P48k\nGf9ZgkHeZut0IfJ4p6qrPtMmR7PkwJfOJadPIbKjSRGLS4it2hXe99MHSNX0\npSXfVAEvTSP5lIcSGDz704wpXxhwGtnAyGPuxcB2bIdntQxOckYvAuc865nR\nMKrQAyLTNFhFdq8epMQx1tsSf10fsq+luz4tRNowcRHDCTWY8H9IXD/h/jBp\nO6YEgiU0rq4HSw9G7mVNgUTufckGniMk7crgH97IfFjxj4ASt5xbLUU0GBol\n3Hx+exiDnXDS5qu0vIIzLISi2GGBOfZhGB7R9MKY7QyNlNPRC7swdu7kiTDY\n6UNeUXrkELXi03RFelJ4Ei/C8QaR4pocYwkHIZIJjGEOxExRI0CNJuHYEX1w\nfhsXb+fWtWynZfYZSa9CIa5tDNz9O2zFvqIPL8wuYgrntquQRSklKe5o3MrI\n0JAY6Du7+p4VJ7eahAtFr8hkOnPYF4l7pfqVKMUPiKlkVJuti3Nr9u6F6bhL\nbkQNnnWoOc3BYEUlGtph+rU9N4isaNiSzMelIsf6Wagy6Ia33BNh+ZWMrCI3\nA42dMd+o7EfCPzZ9eoUsgPqtafz/0OAHq1JSxmtLho8liAF8ErI21X4rfP1e\nNK9G\r\n=mURm\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/extension","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","engines":{"vscode":"^1.5.0"},"scripts":{"watch":"gulp watch-extension:merge-conflict","compile":"gulp compile-extension:merge-conflict"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","dependencies":{"vscode-nls":"^4.0.0"},"_hasShrinkwrap":false,"readmeFilename":"README.md","devDependencies":{"@types/node":"^12.11.7"},"activationEvents":["*"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.48539eea8b_1589502340518_0.8521643212810799","host":"s3://npm-registry-packages"}},"0.3.0-next.be61b7d3ab":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.be61b7d3ab","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.be61b7d3ab","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"bae7934694120f525dadca373853b9aa3aae7eab","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.be61b7d3ab.tgz","fileCount":12,"integrity":"sha512-ZMmcZG9pNCmoTvWKqAMATY5iw6J8H9yM8G9N+yCBAM/dqC3aIae0z0Ik3A/ZPW0zoFBrzaS+hIQn5s30Y2wAyQ==","signatures":[{"sig":"MEYCIQCigevonWc+6wfQMXHXvgPU884u2bhVG8ZBlf1Gt0IjCwIhAPPqD2LyK9psXg4jt4O5zC6Np2YbEfUV2hZXgvKoYMli","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":110625,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.4\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJevzNOCRA9TVsSAnZWagAAo3kP/3Y1kImvgpypqqVLgt72\n4Y19WVI6XxGnMQZVN0m1XI903vI5nEDTedy3wROr8ESpY6TnK8pSzJEtNC3F\nnl4/5Loy1KmMHrkMDA7m86+8MZzlnqQMDhN4uuDbbG6z6Cofry5WWhMV+ed6\nTzGpz1mU8EnI+4c9IeqgPpQo5xEaKsWdFi1OX9R74fRBwANtIzBM6vSANVdc\nPvrqsmms3Ikh/iZnpsaCjGehlNtI8N5dwK1/a2FQBIJelOGZPw5HihIH+jEN\n+cFzbH7MZyTEe0/TuK+ZiuRMDY0P42AFH+yAatgVDxlSJHCJdUVqBtAk78it\nzD+fM+NQlcFomSxC3fya1VdOVc/jR+P+ud7Jku2J7zOnoUDZ9FlPp3cWtxQU\n7AN4lrImzPzsAVsifFPFhi5mdZ0TveU4WSGRFN9/OtKelaJajdXGu7QLCdJ/\nX1JjoTJlxwHE3H1LRIR9t0F6YPxawyEsOowlK8v8tDvx5egxSh4VDvcpZgqu\nH5RtkKnX+Jpi2kGE4RG8zOAU0VbRe6tGIPAZmddoEJkRMsG3PCf80zG1ZgiC\nqRESky+PAIgxZ7aZVhmSQmliJonnvobwVsRBgiHS6/00UAg1V7KCtuE1v/Rm\n2jf1s1r+vEqaEXaaSDimMr9rW5V33JCHgvghbV2/ITthRPbIg2wVDJr9S8QS\nmEi9\r\n=o5ek\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/extension","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","engines":{"vscode":"^1.5.0"},"scripts":{"watch":"gulp watch-extension:merge-conflict","compile":"gulp compile-extension:merge-conflict"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","dependencies":{"vscode-nls":"^4.0.0"},"_hasShrinkwrap":false,"readmeFilename":"README.md","devDependencies":{"@types/node":"^12.11.7"},"activationEvents":["*"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.be61b7d3ab_1589588814113_0.928370711764964","host":"s3://npm-registry-packages"}},"0.3.0-next.a1fd802669":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.a1fd802669","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.a1fd802669","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"6ce6db9a8b2b524d9e059ecb05ab8b8cae273402","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.a1fd802669.tgz","fileCount":12,"integrity":"sha512-Uj5AzKbqTNag1R2+UUeRwS8/xG1Ub9gsb7k14wtPJhIrB80c676LxPuPS/z3PQbJPdySjsm2gBWiYxMwTR1XBg==","signatures":[{"sig":"MEYCIQCR4xnh25cYnCS27MZ4r2CVDHdm7KWizumWhoemtis+JQIhAI/Wo3GjLPqq0Z3ET/PpAzXR2igZfWGQJb+LHAGlG+N4","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":110625,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.4\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJewITCCRA9TVsSAnZWagAATIoP/iOdmVIIAW+z2JxiD2oR\nDVEyvSVoy445rw8onogl3kDfKr16/raoFmmIc9TpX/HbCbAG2qImmkyxzXFb\n55kFdP8wZ4aP1cCJZeu0+7D84CfpM/txiFboXdV/DnZvejyGYeZz4h4WxDm/\nUPVNTFshraiRqUUB3B0ejVkUFHgHidZ6b1MeT5f06xaUTHlJDaXQGTaY/iPF\nfBlv1rFTKB68pwFDAjQ+1yM33APNjk6qc6aJAFCZefdvljrQUoGELrWegQB4\nZps0eAOST5qRq47zWudfUF3/VS8hGpgl3rL6g74nlEk5a8vRQ9fHuerYLYP2\n8Zoq7axOain0tu2nx1RAfrUb5Ec1VcYrkhYgWofBwZeCSVoeoswhAhT9SId+\ndzFkzrj3KMwR1Nw42JjyCEQSxcaX5KxbQU/GUJsAf+K8mltVjsT7QTzPYARd\nkjnZdmZW0UIcmTavOI4bztFG7EM6IySP0KpLb/gsLkQpZuOjDCcWD6fNbHHT\nZLEo0i2KpIwVxUabdKDjdkln5mjZ1vnUFLPFuW71/4ZDPMaI8Uzegm2FYcXF\nVsnN2aHCutSGKI9btCFvHCafTEXHvtKMgD14nEYFlRJbMPlcOT9aGxOmlWcS\nyPYiT+FpdrCNf5f2sbZcpiUyhVT20Zvrj2IosfxZ7rlpeeFi2A7/XWWdbVck\nB3UN\r\n=qUkF\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/extension","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","engines":{"vscode":"^1.5.0"},"scripts":{"watch":"gulp watch-extension:merge-conflict","compile":"gulp compile-extension:merge-conflict"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","dependencies":{"vscode-nls":"^4.0.0"},"_hasShrinkwrap":false,"readmeFilename":"README.md","devDependencies":{"@types/node":"^12.11.7"},"activationEvents":["*"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.a1fd802669_1589675201780_0.42575185064601095","host":"s3://npm-registry-packages"}},"0.3.0-next.6071a17e88":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.6071a17e88","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.6071a17e88","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"32919e7950933fd124a6f24a2286520c2d104b03","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.6071a17e88.tgz","fileCount":12,"integrity":"sha512-1lugB++IrvavEE1ZsLF/MtX4RvygW7FbobgGS54bMeoFNcw4URlpfeMXrhDPtAk9tC6kBC1UUd3ZyTilsRYlQw==","signatures":[{"sig":"MEQCIHzGy6Tz5xpqokjhOMHpiREdDFAeJO+E0vmtCVj546ZZAiBaq64CsJmDTiad43SmzHTChHAeQEyNAZiw8n6yGPkKZw==","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":110625,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.4\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJewdaCCRA9TVsSAnZWagAA3hoQAKMx7Dpd7Ix7ocp6eP2Y\nxGM5Vjj5TswE2gsHxqEzSw4LzQb/xX3Kds+TXe9wEO8CwrlCYq7gjBlUT8jS\ngwnRdJ/iBXDfMOHiR6rcoU8fmIHGYr/fsFa9P2JlvOEde8fhVQwmsbM53zrb\nWrodDe6ZK03ppXeilkcqTZzKff7r7hMHnEm2d8VsuFw2R8mMQCgFNFRczehx\ncXj6fAFIcrYStmwUVJX3SCtbABIt0NC+uKY7MfourtPVVA+llV9DRgErr3/0\nQ2D2z/alX3RmEW6TF3VBbHtdvDsg+99u2/SySrMim/wVuwOs2jKUMV8QqZdZ\nviDmF1cm4RoX7/Yowv8zepFl1DWZ35bnc2KWBytYZC1dVXsH0D4utEvIrM9y\n7T2MxsC9is9/JQHXFj+bDG0ersTjcNBftHS4enWUx6wbqvz+faOrB6sNAqfM\nyWyVjjdCXG15S4fBkPyQfO8FORPWbnNYgmgMiYUuHMsTf3hgL7DzgFm06I/l\nJdOl41WWwO+O9Eksedpd+CVpvZfUx0HHwEVPixWW+HNIrARfW7mJKbzCiaLd\n/FOWUU9siQysoD7Qpy1iEUEpOo5pTICqrjyM688E7Paab4XJ4BDsqNEhsMo9\n6XQGCY/p0hCo3t9bR416lWgdCXDwnu0DKa3/TntXuRbcyWuxT34isR4+g+Vu\nWBpO\r\n=xB8j\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/extension","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","engines":{"vscode":"^1.5.0"},"scripts":{"watch":"gulp watch-extension:merge-conflict","compile":"gulp compile-extension:merge-conflict"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","dependencies":{"vscode-nls":"^4.0.0"},"_hasShrinkwrap":false,"readmeFilename":"README.md","devDependencies":{"@types/node":"^12.11.7"},"activationEvents":["*"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.6071a17e88_1589761665676_0.2708530040067547","host":"s3://npm-registry-packages"}},"0.3.0-next.a7fb3ef303":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.a7fb3ef303","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.a7fb3ef303","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"578ca9d6eb2e3944e6d18dc1236237bac2d7686c","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.a7fb3ef303.tgz","fileCount":12,"integrity":"sha512-o88s2GCHSO2wHt7MEPagw3gS0SlFui1XlIJ3N3BiJm5nc1uPiacRdrm42BG6v7vNDuzwNRwMP89fP9xLSgPgyg==","signatures":[{"sig":"MEQCIC7dcYaj972bPHvCCXAP3zcq7WHN+8muLdc254u1OJ2wAiBQ5Km0NtHi2+/LaNBj4kgXFtbGq56JUynmB7Zf1qas5w==","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":110625,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.4\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJewygUCRA9TVsSAnZWagAA6F4QAIuTnHemmyd1pRgiDIgi\noTvXXftULVXbmTJQtZqFuwfm2d9V82jwdkCDiiXiy02fU0b3bFSLI+udgo2Q\nQ8ImZobyez/NXX+oFj4lNc4a9LKxs5hoiQsAktguXOiwMS6MtZPkIWyMQyT3\n5/BKMplxRNm3F+AsVnpBx4oIbz/N24fsKAIED3KnnvWoi6bHjhbpcSiuosKs\nApP5m74zWjD7n9NFnqGfdIYcSXtIiLxdYv9P3gIrLzCdVqcpMwhq+J71XdjJ\nY/XxWFv6xHmh52B7dKptGgAp8hvAJzc6o4OOAz6ZzeqpPia4Dl5k+SWdj12c\nAsFdHSFMWFaTV3v7lbm1PqEYArofP3HB4EAPKjZ/deedXOfUTxHkvaTw06mC\nMckWuaHwNpb48Cqu/7/brPWPvcZ2O61BxczSlYGEHOmDZCMxQM0mF13OcGXQ\nV/2RyimLV755Ot+MOHgGwDAqP3JTQ7H5rFQ5zXMUAef/9JcDckm0v/hTBXDx\n8FQomyhH9ocMoHWUhGGGpnK6FOMUCXeMG2LubKE+32myB2fe+QDW/7NyEcXn\n5OPQTZ52MUDGLgMhx5S3YJLzGhBxx+uE8zlzyyMqkNdK8mdiTBFjcarSunUc\nOgMLvqi8r5RqqQWeW/SLQIChRwyVv+9SwPZbSe+Jt5Vlyz3PqW9R99lAnDCR\nsNIM\r\n=zFXY\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/extension","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","engines":{"vscode":"^1.5.0"},"scripts":{"watch":"gulp watch-extension:merge-conflict","compile":"gulp compile-extension:merge-conflict"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","dependencies":{"vscode-nls":"^4.0.0"},"_hasShrinkwrap":false,"readmeFilename":"README.md","devDependencies":{"@types/node":"^12.11.7"},"activationEvents":["*"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.a7fb3ef303_1589848084116_0.01652111033819481","host":"s3://npm-registry-packages"}},"0.3.0-next.d1a59226f2":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.d1a59226f2","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.d1a59226f2","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"3f6ea59997ee645cec651c44bad0a4f35aaeca65","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.d1a59226f2.tgz","fileCount":12,"integrity":"sha512-EeIcZbP7Obu6fsvlruiXj57/xijCkMsEO90AnGnLUb37w6pouajLBRnipe/qJC9bgu0/g/dMo4Vh74XXPsUGFA==","signatures":[{"sig":"MEUCIQCSei0ar0E6MbbUsYU+XM0ZXZpnZwd2zkKjqrHIMkVjAgIgDdx21GRIIfL1el4tTlVaGcjXwbun5EvkCfbsxHSm0zI=","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":110625,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.4\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJexHlgCRA9TVsSAnZWagAAgMIP+weWIPvEEd0UJes2079m\nZGjcdTAoPWFwqMRDsxIRYnXMbJyNrIxD2XoauanKJLCyjU6rYlH9WnjunRxS\npAGToTujCSA0p6raakGMgFR3jh7EOi6RCmAQZqXTF4/FV5QcXGlhqpHBW9QE\nE1iuiu6i6fPa9pBnONffNoxoeNXPgFze7WG04e1/+2JEzkT2axr1VagzeUHd\nUHiaOE6eov7+ZRBMnxKvx1bB/lBM3wvU/dK8Z0qgKkfUI358BF1MqbG5ctty\n32AQVhf7+tzLycnbNn4wroaZEVzfgYXlcnuMNRB6UoDicJPbBPnTGvfmNHZ3\nGvIlPfBFqjlFQSmwXUYkBUQtCkCZ4VwOs7kjxq7xuqxZeg1XBam9pE8XHKWL\ns8PPPNKUGMRtm9iRHpgaZBUD7tQciMECtsCEFDdtR32eO640n5hYeSatsyG5\nzIXh8zKLyt48ETkhEr1qz1aQK6TPsFDHuwpAO6TRlg3D7K3G4vwpDIs3LHsz\n5mAH2+48eT/H2fr9uojlj03Ra2W7pmF10j9oU4hcBLafLXUHBEvZNuxVfh3r\nRfJEMezBzFBPgTcCca175Txnzp7+QbPE/eJrox6hifBgsCKWRGbRghun2a8R\n9IKIqfy2iI0gUTEDms3qv0AgLom8DRx//Gcd7Q0+AZEJYVTubRlwSRAQ3zff\nlUet\r\n=G1OY\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/extension","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","engines":{"vscode":"^1.5.0"},"scripts":{"watch":"gulp watch-extension:merge-conflict","compile":"gulp compile-extension:merge-conflict"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","dependencies":{"vscode-nls":"^4.0.0"},"_hasShrinkwrap":false,"readmeFilename":"README.md","devDependencies":{"@types/node":"^12.11.7"},"activationEvents":["*"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.d1a59226f2_1589934431949_0.38066799488819747","host":"s3://npm-registry-packages"}},"0.3.0-next.fbb367917c":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.fbb367917c","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.fbb367917c","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"35302f711ea71820cfcffe60d5701c4da5379dce","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.fbb367917c.tgz","fileCount":12,"integrity":"sha512-udk282JQjLu1Jt1Lqfrtl0W7anV+CnOqHOjY/HF6/m7rkhLliO/nbGWQR2oUPILoD+Ml6TzsCIlwNnxb1PwqJQ==","signatures":[{"sig":"MEUCIAQH0szpn4UAWJ1yz8EBWu6UX6c1uo8V8DOpzT//JQrIAiEAkYLysM6+btHf2aGNQ/HyqBJdH6XXvXI+EfL0e/4zmCQ=","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":110625,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.4\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJexcqUCRA9TVsSAnZWagAAaxoP/1rSTG+KE6w0J7pt7YAq\nsQvnsD9ScFtcCx4XBrLbz6rwzsR3Rvb6vExhvXDFlgIZxZQRFMJtiQ/ariJe\nD7uyQA+V3IBLv92fruw+4mLAaCez0CbOf76n3brXlCezWynNzxvSIVhfQ//n\nbnTg4VWZ3n/eC0Erdc6zgkzGnPtV46lCEpwbAItVw7X2jGl4Xk9G+AuKhXet\nVYT31FyxJUySz/nziePDtu+rB4v1ogWf4KjKfALH+xS52MZheOFXEz9zIUFo\nr0PoZbwRdm4h+XenM+VaSqke5RakAOLJvnaiQi2NchWeiVCJ+xOvfMfnqbUF\n7sxa3ttLlVSZJtNrTNfz2XRhDSQR2fT3GWmDUvdIZXBqzsDj7T1CjkVzV1iT\na2KnJUb6Q+EOhmwJfkxaGEd8M5xo1gfJj2UiYC9BvOUCA0P/PLnzZDhki5zB\nrb0ZzehNjoWCEJ2pp+Sz4ktiTrzZVi8Bb9MxKpq5kwV6dC1pxYKlHl0q6cgk\nzgx5KhPMmp+wbecC64+UJdyOHmgWCTu4myn0vQHZ/9wDuYEsUj+i054g5uZd\n8W9kUPyPW589X3MURF83nVgLlqEyNCI3j5C1FcGEhuM9AEvYWMtvcqyc3JUT\n8qMi3li8LS1v9fr18SMxatcRl2YIerpDbN/tuhQDV0pl3o01jIwlxMV4K0i0\nAAvz\r\n=c0RR\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/extension","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","engines":{"vscode":"^1.5.0"},"scripts":{"watch":"gulp watch-extension:merge-conflict","compile":"gulp compile-extension:merge-conflict"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","dependencies":{"vscode-nls":"^4.0.0"},"_hasShrinkwrap":false,"readmeFilename":"README.md","devDependencies":{"@types/node":"^12.11.7"},"activationEvents":["*"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.fbb367917c_1590020756273_0.26468233945781217","host":"s3://npm-registry-packages"}},"0.3.0-next.674b549669":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.674b549669","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.674b549669","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"79a6c8ba782c79dd2adb40a653548bb1514a1c85","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.674b549669.tgz","fileCount":12,"integrity":"sha512-IFOpQjm4zBpsRK1BtIjWA+xp2GSjvdpW5S/2qz8A6zmvnxwp9XRm6noFmwS3JTnz/6KuIWUmThjSxhbBBXcx8Q==","signatures":[{"sig":"MEYCIQCVt85U5f6BNhhtnNLi2pMDAhlvQyjBmkZplpeNhYTCbAIhAIVuDGkkvPgIyFOISCqf303DNUVNyQmcmtODgrYmFRkQ","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":110625,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.4\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJexxx8CRA9TVsSAnZWagAAGbwP/3g5gjpRlfzjO3FVbugm\nBfeHRpM4Y0bGPdDa0TD3hYkn5czHahdAk91VDvsOqEENYlkeIdCGdoPOIHYO\nFPUtPjB6pvXvWSPuALgm/gAws11M9jg4L9vt+w/4AYTyiJ2liz5maWAFSJUl\nPm6qnDhgSGh26bKfW0EG7p8oQahCowBoS/4IY6FQOLf2HUxOpr2oKOENmfcw\nbmAlq1QcI9zjEGMKGLp57dBET+Y0JIUH3cKgHGvyuTXpyiX2PTI+RBFfG8dF\nxrMtilXI5Gaj1Q7/colfOXrLVI3HGHDZCghUgT6uc+F9eaqFK9XejXEjtA/1\nXkJDuPjO1HxBNkrXIsPsUqDOKr0tvZVahq/SzmhrY5rHAWcz+1ExzK+oB3WB\n5sf4QcOcDb3N0hQfCJ7m4ew9RXnakWNiaR456JOk2GtD4emPq0hRWGzk74zW\nHNrbwMjA4lsQEE4zQvzJzZlijHvu2eigK2o8yf9o67KF68QkRN44Vg9DCVGy\nf84dqMrgmKjRlp7dPywaaZpE1bOnLqsO3dXljvl38BZ+9+GNq1nOHeMqYn7D\nVEqgMAT9MiP6kT2llAmZjgIHuUhpXo4cXXCJMPHk0UJC6N0a6k/yESB11olZ\nvbSCZ74axKgYT3sMa/fXNkSRTkgTZrykGjbha6x1YGqgTVXv77aeVxFeTlVr\n9ssb\r\n=LcSb\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/extension","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","engines":{"vscode":"^1.5.0"},"scripts":{"watch":"gulp watch-extension:merge-conflict","compile":"gulp compile-extension:merge-conflict"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","dependencies":{"vscode-nls":"^4.0.0"},"_hasShrinkwrap":false,"readmeFilename":"README.md","devDependencies":{"@types/node":"^12.11.7"},"activationEvents":["*"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.674b549669_1590107259756_0.30700816376331264","host":"s3://npm-registry-packages"}},"0.3.0-next.a1ed386162":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.a1ed386162","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.a1ed386162","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"48c0234362549746e84cd48529c1155ee09e05f6","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.a1ed386162.tgz","fileCount":12,"integrity":"sha512-6OmIRbVkdklvKUpqwWpx0mWcLhbr8jvzIj/ug+sCtmRTIQFIlv6e8ko2fA/vmyZoupjVQwLQYnLR+jrzWXrP6Q==","signatures":[{"sig":"MEUCIQCd9vB3Lv1pD9fnBVtPXdfDP61kg9XuAJpW9CTP/0wcaQIgUb1tkn8vXiSzE00kO+qgURSLL+3Slqv7HtZRMJbr6S4=","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":110625,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.4\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJeyHBXCRA9TVsSAnZWagAAUQQP/iNLAg5tfDuC1Cc9ARsh\n2CA4MjVTLqQi2eDBaBySeUCsN3lVgKwLDx5ZjbAGVX4CApB+1IS4jHJMa5G/\nTviTBBmJkA7HpvwytrvkrkyaviqFEDH9DGfMM6+65fQYdccska61oVJMeEK7\nkPilnUXwyPN00a1aZhrytrbhj9Wxtht7dNNEFsU/9ipLMA1vvxwu8PCmaNjf\nlOve6UrzhAJeyR0vpA7LvtTRKPR0D/w/9YuTcVuONyV2Oewwh6lXMzyFPT6P\nxE4nkVeKSbAYfOF463ghjuMfvEs+Um9AOf75/2CifaxEZKZdSey+6ODqkRgu\nVVOs84wcYPA6M7sOiTL+uI0OG1mVKRI5CHljMkQ2gvlnHrl0hDe5kcd/YhCn\nKNZuV3ftFi2Xv724Kv+bbGAv6easDjSM+GicReFWHPuLKxrA5C3K+EWx0a6K\nPL/mHRNycsYdagg93BD7gvPY8wvIMQiDAcnhswqI7JnkaWYjL3ROWJrXDZWW\nIe6xik1lakzBm9xxIyK2HASomQXMsoH407qu14NfwdAosCVfPjT6ZYEFghcV\npLNKhhrJsLsMQ9w/N5c2W8bed+3V194MKXis4EahfDt8YZGCbEGf6V3J/lg9\nSN3ZJKbOD3I1dShBy6RDq19lS5AKoE8dSgoDwrjY9N9tMNkV+kaJXT3c3Zh3\n80kQ\r\n=v+dU\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/extension","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","engines":{"vscode":"^1.5.0"},"scripts":{"watch":"gulp watch-extension:merge-conflict","compile":"gulp compile-extension:merge-conflict"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","dependencies":{"vscode-nls":"^4.0.0"},"_hasShrinkwrap":false,"readmeFilename":"README.md","devDependencies":{"@types/node":"^12.11.7"},"activationEvents":["*"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.a1ed386162_1590194263307_0.3253196584505562","host":"s3://npm-registry-packages"}},"0.3.0-next.7e407b5472":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.7e407b5472","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.7e407b5472","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"861f01ac73a78560dc40bb4c0de701840b22dadc","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.7e407b5472.tgz","fileCount":12,"integrity":"sha512-aU5IE6RVy+oRbaAWbB1+/ps/oNpnHH2Tgt7pDukFhYZ2CgbODIcWaUJwvPGM+uFazS8ozLDomZiq+nsBk7hYYw==","signatures":[{"sig":"MEUCIQCLcCrIUd1LmlbxqzLQ+sRgfFajdt7LBDLNASaifv4bsgIgdxr8ugZkUmYQ6FpujLpRLlZkE4Gx/JuxK1GI3KiPmK8=","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":110625,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.4\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJezGViCRA9TVsSAnZWagAA+HcP/2n8fYPAsMF/Ty7XLanN\nARhiynF90Z4vaEVjFbPiyqrjH4CbJpkOBiHfs8b5N353VQDLjgQuS+rxJV6f\nG2jB1cp2r9rbIRzkIY2uHIkXGRZCjGv6qLxOgvA0Df4697rvJ6li8EKOzAuS\nE0ODiqGW71LsM5G5YD3L4AFYlQ691892Tbo4skR9TwEJIfcryFgMXuTPHUrs\nf7LbAZL6yqJfGW1aWUZKKCdXJNhvKwCp/jzb5bp7Z7dh/FF3i+49HpT63RH/\n1uwQhXJwWueQYK3+xlA/sTz4tBvWpLyvhlak/fitvdCEwbPGG88i4pLSYwZm\n3UK7dbfrvl2dBFur7DseIrn7j2vsU0xVCvGTPnzCtqunCV4j2iFnNdy6VbzE\nJAkRj64SgRTxkXKp6dNmgYi6q2Ysguc71Eua7LC56FrG1FpzQcK3VmnF43KQ\n45WNyz9e9JFT5mAlrNO32Yjiu3HRz0U7GNr23bWRC2vq4ASI0FEpj0FtLAnj\nFHXudpDh+NUMAIVnMMbYFLVaD2RqK+RNE/CXH2VjGPK2fz5F9s4ZzFGffALp\nK9JKZhCdM7jWMyGdxSSTZxsa8Rn9A0w9eDT+bkwu1H1h1dDlVbB6GIY+H3z5\niBL+i22Z98BgdxXPr+T+gbsBErkTRPbrBdpx/VgS6cYlAxBDXxjms8rsHW4t\n4DZD\r\n=Ecx/\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/extension","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","engines":{"vscode":"^1.5.0"},"scripts":{"watch":"gulp watch-extension:merge-conflict","compile":"gulp compile-extension:merge-conflict"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","dependencies":{"vscode-nls":"^4.0.0"},"_hasShrinkwrap":false,"readmeFilename":"README.md","devDependencies":{"@types/node":"^12.11.7"},"activationEvents":["*"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.7e407b5472_1590453602273_0.27024719743316705","host":"s3://npm-registry-packages"}},"0.3.0-next.21d6116577":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.21d6116577","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.21d6116577","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"1c74fdf224b5ca26c1e4570a9f89ccc554b407a0","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.21d6116577.tgz","fileCount":12,"integrity":"sha512-CpnTwM4MHw11FRw43RqysHn1tk/gPTMJRlAFT3p7mdLpjjM4GjnpZYpH1dQD2VBaPpKLE0EpBNFCwOOFUQ6cGg==","signatures":[{"sig":"MEYCIQD3TsMA4eDHGjgEfdzZpdvf9qWKsBpBCoHFFWPEujzYhwIhAKOevIYMt78td9+CJXjWWcRxxF6ck9LSYilVzdQBXq3O","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":110625,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.4\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJezRo1CRA9TVsSAnZWagAAZpIP/3bwQNKrJ3fnR1zyXRPy\nx25PtVg8iQze66ossaY4sWAoq1lzhKmjpxDT/ORYuAL8G3N/idzLWaVlE9cf\nzxmQhDh63mzH3ErYAMJwhW4tMSrKz5x2xygNgcgibqzhVxDxsRc4Xpr80RfJ\nn10qTcr8xL8bZAFKo2oJRbVgFhv7TOVB8fKsl5YhK58G3Yh2HzqCGkut83Cj\n7UUHqcHcY0vzlMhywWULecD9QWzZLx2i/sTw0N21bFHAbu47nQyXpwXA0wKd\nqKrTQVHyy22fwTpj3ezCgEXGJCJyPfCF230zwo5y8PqUxo7iDlcO2/+6yWyz\nxwUlE/TyZhb5k+SohbLxFfv/eRcquhkaSlKteGUXbNjI8dn8DBBYo5adHXlE\nw4pcE1KNKpb+/Pq6CNse74eM44rNBKsImmGf+lznTEPct2oiZkBUcJjqmFIV\nsj3J7mk8J6OHrVrk4PAH26iz1yAGDTOg9t3vzkyeNhBGHDbtT4R/THWNUkfL\nS6KuLxHyOtFREGX8ETgq0HUXUcenIr1Yqmb7Qi12kjpZga0gdit+vtzOEmpl\nCC61HvaG9/37LocmOllHiatlTFzlIbC6nSMVF35wvDrCxIiyHZVJCcRyO9cV\nUmvQtMsV17uVguZvozASlv4IJrWf7m/pmpqgKcwyKO0XIAFVFbuXZo3T3HB/\nLsDT\r\n=JMgb\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/extension","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","engines":{"vscode":"^1.5.0"},"scripts":{"watch":"gulp watch-extension:merge-conflict","compile":"gulp compile-extension:merge-conflict"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","dependencies":{"vscode-nls":"^4.0.0"},"_hasShrinkwrap":false,"readmeFilename":"README.md","devDependencies":{"@types/node":"^12.11.7"},"activationEvents":["*"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.21d6116577_1590499893070_0.8407536355652183","host":"s3://npm-registry-packages"}},"0.3.0-next.040034f7ae":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.040034f7ae","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.040034f7ae","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"496f6321b8fb580917877cc4f0e946952def6432","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.040034f7ae.tgz","fileCount":12,"integrity":"sha512-TMrcNVwXWViRjGwqHV8/3CJHUFKEcGVK7EVzCa6hHUd3Mna7WkWQdoZYj7/fENi/FO7jOOIW76uKMqTAmiycyw==","signatures":[{"sig":"MEUCIGcsUUfcryjvSg9YBsjxh3R506QszhfGT9P7uwDnSn7cAiEAn/J6gogrk5lsr1VWVgHNZcB2lR8iDkMv+GoprWfDn4s=","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":110625,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.4\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJezbcHCRA9TVsSAnZWagAATEcP/RDj35V3aXhQrGNUwFNM\nEOUFK3Vu7CDQYVwwgDY5D4G9j3gNemUM57LprrdNHsrZ6fdn/4+8mX5gwE2B\nmcQc4d1mQmY+xjjrl9ahqO3vGn/YWM7TnLjasJk7UtFNGvlPL8LZcZNj0BT7\n/fcVUk7lNa7voOky9/Qb3mUWbCZHyUSDrErZYcPeVP+8yr908+JCRwOR+yh8\no9LZnM5Agp3HR5ZpuPXa+d8iJTyPgsTt+sv7g7jt77fCLg4vZH5if4+UoM09\n54E1mevY1R2kKY+gpXCg/EJ4VFm5wf6OIjJHhNgb9yhcpbUspctIMf2Bkdyf\nSrUOmqTdaIyThUpLJQMYGT/7i50EqOuf+r13p1kdMVhfV3vK1PoKBe057Yzp\n+AeHwKGaQ6DA7F+0Wxpj+1bnDotB8a8vHoooRTq2BsiAD7WRn5ItWlRyIksQ\nQ18j7ACOAoP5kGfh2Egxw66Pp4KZOi1QEOn2/PNjCADnBYXA2fTAfMihy9DL\nwFZK5s6p58ivKEWPZMJBtIvCi5Q0y+VUNFYn6d6FJdDodBkUp2R61SoO3j+q\nzMfL1jVfNY2ybZ1g3FC3ARrrM+4wz8EI5YzpPeSYWWkFkOswCXFkPnoUxg7y\nfpPn42s1TFLkUbcx95DqERjkgOULcvmB4uEM467aMOEBUwQ+Hz59ljrKIT5h\nfSbi\r\n=EW1J\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/extension","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","engines":{"vscode":"^1.5.0"},"scripts":{"watch":"gulp watch-extension:merge-conflict","compile":"gulp compile-extension:merge-conflict"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","dependencies":{"vscode-nls":"^4.0.0"},"_hasShrinkwrap":false,"readmeFilename":"README.md","devDependencies":{"@types/node":"^12.11.7"},"activationEvents":["*"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.040034f7ae_1590540039128_0.57867144783292","host":"s3://npm-registry-packages"}},"0.3.0-next.40559425c7":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.40559425c7","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.40559425c7","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"9fe28c59ad218c52156318d67a4671d1e0304d14","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.40559425c7.tgz","fileCount":12,"integrity":"sha512-RZfgUA3IZmI2GEgVLh1V9hhiCvacycmkx0H3PrYboIGa8pvLvEniwr0CP9RcgJ6/LXDgsG8PeJTF4QdwsIQtpw==","signatures":[{"sig":"MEQCIARsTePNqkXn4+V79XYaoBB7+MRz+rFkmEa3OFST2ZrjAiAR/yKlxqoxTtab2vck8RSPX7cModYvsG6fj3I562J3Vg==","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":110625,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.4\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJezwj7CRA9TVsSAnZWagAAd+oP/1TnGp448Oj0uqoa0kKk\nsmB1PeBg144rpoW0ETgy6QAodNxwFylgA/w76XYhT/pamRdawBnmWLl4M/mO\nNz5dRCdDf/CimOVrGM9ZSmdvY3hgfPv396eWpM+YOApyRZ2x0rJZ2w4OXlvr\nL/AmudkafqBIj/XIzpJ24vRoYpFA92gYOp5jR8PJp3KOHHkOpX30Z8gSBHTa\nWRIO9i+JknXO7FXDy5AhgPrj2ktwLoonUje0NnoEgzB4c8WOEtJUS0sbjCCf\nd5apnOMumSUNeycxCvu3vHn9QixoDp4bV97+VPqcmNAsVfTwgFQ5QajnpaDR\nxMmtdwDqBZuOswjIhIGg3eSKg3+7R4IEMtqwE9I+GQQs2Em49ihYFNskWFdp\nMxGV85spDnfqKZTcwcVT9JQzuQ8b/wGPkMxEwGgwlG/Cmkmzd+rE1wWrSIYL\ni58L5aQHqO1XIq7+ecUCLReC54vbQvdxAcgcVdDwjNW2oTlORFf4l1pGnbI0\ncLhraQb0Jjf00wmI8mTxfUp5KDvgQJ1HYy+Pjbph0TD+qvcQAvBLami4OfpY\nLGdiupESe056g5XU/gI6IwD8hdf0TAYE6Ik2bNMp7Qub0xNdJJrToK/9iK0M\nUAhiJTFHYmCmxhwEi6UsA4sb0mwtHmdFt+xMVJASYUPvs5G5TUEbHpNGYoNt\nEQZ7\r\n=OdGZ\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/extension","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","engines":{"vscode":"^1.5.0"},"scripts":{"watch":"gulp watch-extension:merge-conflict","compile":"gulp compile-extension:merge-conflict"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","dependencies":{"vscode-nls":"^4.0.0"},"_hasShrinkwrap":false,"readmeFilename":"README.md","devDependencies":{"@types/node":"^12.11.7"},"activationEvents":["*"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.40559425c7_1590626555152_0.7764912071890036","host":"s3://npm-registry-packages"}},"0.3.0-next.028241b160":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.028241b160","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.028241b160","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"51554416d7e71600e326fd0a8e62d811a6826da1","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.028241b160.tgz","fileCount":12,"integrity":"sha512-ySBcW7fZrZug+uSEJVam0+PNtNDFiYxowgEkiPyY71JSQg1LK0WNO6HguthqOum2UppMFfaMfBYz3OIR2mD/WQ==","signatures":[{"sig":"MEQCIE6OPLNS37FbumvF+UpQ7V0R6PSWuykL6h1w1gN9BjtqAiB354llVRzSA2ouYkxZjQyMNDmhNlOVJh9NIP0UnYpHkA==","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":110625,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.4\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJe0FiTCRA9TVsSAnZWagAASgYP/2Rmofy+K6Sy9RrTMsJX\nhj7ZxiTdxDLMcqcFA87aU6J/xkxzDg8gFFj9eXKVQoeBA9+ZsN9h7pZWKAQg\nIoBYZNdPX0FzSc2J3W3TQ2DsSPwaZm9wzjB/st1kV/fK//9k9TzuxgZRKEKE\nV3gfJSXjST6qfUsA7O5Euln3K8Wp+CHBbCJdkECK0oVDQyTk1hdPSaiRb9gK\nzXJXFXvl3twSdGfdzj/wrmqzCZFpCiloI5yVBqrqgX82ZEgel2dqDOHCTtL5\nTA67D4hftVXpjDkKwU66hYjnrWQLSRtqqif+IGIJ+OWTv4HSZgMB39zV1DzD\nhBXxJQUdSOC7BIGx/clrGK6CwGGbO4uK9PPUcEqhQsLybmW+xjE//o7BIyJ8\nYlKxY9VUgyxjUoHA16dEuvvt1A7V8nJjpCDzpPOnUGHfctT7mLmUn8ug10Dz\nxLmR9J0Jp/DlFKQVGmhRJ4jSO+kGVXjNAmrEzxM1oguJfciMNOstvDhpyrFe\nGE/1/K6f8vUNj+krVBBswOmEi1ozpO5rtUbRojwNGnN2RlRmEKFGULWQDEQo\n06lQCMRLsATRL57v4QUZUjb+/XMYDMVjGxZTmcqnoGYtUq8Sehnnc8NIMC89\naNQMq67j3C9Zy0UsIU0Rv0I3iTslphG9whfH7KLPTZi+c98ReMU/yCyv7fSB\nKRVH\r\n=xk2I\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/extension","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","engines":{"vscode":"^1.5.0"},"scripts":{"watch":"gulp watch-extension:merge-conflict","compile":"gulp compile-extension:merge-conflict"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","dependencies":{"vscode-nls":"^4.0.0"},"_hasShrinkwrap":false,"readmeFilename":"README.md","devDependencies":{"@types/node":"^12.11.7"},"activationEvents":["*"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.028241b160_1590712467409_0.3804516726239924","host":"s3://npm-registry-packages"}},"0.3.0-next.e70bf91f55":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.e70bf91f55","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.e70bf91f55","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"f7b8332346cca09a82322bd7cdde07f40abf3a13","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.e70bf91f55.tgz","fileCount":12,"integrity":"sha512-ACLs6jKrhw1j5/AcHyAWOua302uCZNiFph1GgSZkSIFtDNx7bxRACqvOG6frbrXWCZSlUyMy1mL5FJQRgHb3EA==","signatures":[{"sig":"MEYCIQC4cH5SsTKkyMSlzwaYdpzsuIXP/CJPdN/Vh7xBFKMBngIhAIIs0FpSWLKvQC7+hqc1e0zUoWmWZWsOEL6dGafd6Yhc","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":110625,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.4\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJe0anPCRA9TVsSAnZWagAAVqoQAI327tHqEly8rlDmKdmG\nrhU1MGpWzQ3FO9dq7WLwbVKXtAI3wB45S/VsXgx0jx7TgOTWUlrdmIDLoey5\n4CHvNc4rZtHpTZ0G4jguEX3SIrutxmBFXx6a+xrBhGynzUHF/AhDyjZ42GWi\n4AreNITk0XBs1MZeiLnezijyrW0p+qkZrPMlzT6uFFEianUdRebltvs/z2U1\nRK53tQdnZ5w/swx5sq47PkaPaJu+xC3tugYeGAGunSCUCIkbGPs6uLd0VrqW\nZk+R2hElGSN84zLoM+zFrk3oxWrZ2dtHMrf40lZSHQTkFasa8aQX6JP9C1gd\nLIdu6AqdB8A3OG4i93DJY72Bt3nv+pXUD1aQAlW7g0KHclVxyJ/aFedhakQn\n+WnHDYQmUdanP4KuGk3s1Gnjyky1OmVhZpZqpn1vLHXINRlS8wmCioS/+F25\neXyAkRbNDLFDqgK0sKM1u2epQ4G1Hu0TW65PLG5Bz1mdaiHbYLNh9llBKw08\n3LzrcKSqCZUMu6m8BgKS7oCg1PWsGtULAGEIrg3erUb71v3lwUORJ1SMYbiy\n7Vt5o7RNyr3uyF5MNjQo8OgUqFdct0eTmbjNNj0ixv4gQgtGXsG/pTLSXTzp\n+dtrPo4HGziJnW+KChpR1Aks9wt0uwSTiN/WdK6+P6L+7ZX7P+gHofZ7r4VH\nkuzF\r\n=xBR5\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/extension","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","engines":{"vscode":"^1.5.0"},"scripts":{"watch":"gulp watch-extension:merge-conflict","compile":"gulp compile-extension:merge-conflict"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","dependencies":{"vscode-nls":"^4.0.0"},"_hasShrinkwrap":false,"readmeFilename":"README.md","devDependencies":{"@types/node":"^12.11.7"},"activationEvents":["*"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.e70bf91f55_1590798798818_0.29867853254874555","host":"s3://npm-registry-packages"}},"0.3.0-next.50f907f0ba":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.50f907f0ba","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.50f907f0ba","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"c81d5abefd0537ee96693a57217fef58811c492a","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.50f907f0ba.tgz","fileCount":12,"integrity":"sha512-D+ZpB0ngjzTpedJ3zb/Z9sOeMsz+pyy3hRIrWui9WDqZYJ6mRqc2jPkNHtzSOAGSGR199Mywwp+7t+DLEhecTQ==","signatures":[{"sig":"MEUCIQDdLc04M6RcF1MM5o+czreJgT7oOsqGep2LRtXvB2RBzAIgaE1zIyXno7g0Ujb5AEdSQzoVsvB7oU+pZ8IaspFlTDM=","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":110625,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.4\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJe0vujCRA9TVsSAnZWagAA16AP/jazStBHmOK+5dN0CU2t\nnqWj1Na4dJujeV3i7xWHym7wkn5CTiP/C+ne2uYzn3qz5stnlP+CdV6bJkWj\nmD9EXXI4uIUtYIHxHd2aLVO+HuLlfV0aKFOnmfRhINLNgZuqNCktOAFnDfyM\nqk0NShy9HuhHtjFSA4/9cITfM0GaVyF2RmjkfbGVpgjRkBffUbK6ci8jgBAf\nLHFCyi9Q3HOvEQlTOo0a0OUNN8nlfCHO7YeY6mOOzAV2y/Q0F4gg+OSslwy6\nb0aCEtHkdxcmIRLw/z0UmeCYBmh762tk009Ueq7UPWpYlPBANE79WuKKisNs\nb3gOPL77VxpNqxToJNCK0H0RwpFgrW4GVupmVKv0NGW+tXK7acfa7iuQNIQC\njZP1fJsr/vcyAaJmBmidUC9VOPjzmc02vemvICmXKMSjq+15j0n0VIDDKjnD\nSGFRzLFk8KCABvnR/E4HiPdafbKpyUpZxkSciZLDQa5bARkdOq/dk9I9TwLv\n6bnlFE6eN6+z1NseIQwd+Fa9kakLof3HGDr6Q2wxCstexH1FErXYahsxpWpe\n1/RQ9jTd68qTO6Ztc7ySwgcjB/UmkgjhCQ34WwGlU+MN5cj+3JJmOJwOj8B1\ntyMnPes1RIsOwYPk5wcJPMO+uA5t3QovgsH6ON4xpjieK7O6/0vZZm579pFl\nDRjV\r\n=dWJ/\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/extension","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","engines":{"vscode":"^1.5.0"},"scripts":{"watch":"gulp watch-extension:merge-conflict","compile":"gulp compile-extension:merge-conflict"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","dependencies":{"vscode-nls":"^4.0.0"},"_hasShrinkwrap":false,"readmeFilename":"README.md","devDependencies":{"@types/node":"^12.11.7"},"activationEvents":["*"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.50f907f0ba_1590885282542_0.06424541525080363","host":"s3://npm-registry-packages"}},"0.3.0-next.79a1f5a5ca":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.79a1f5a5ca","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.79a1f5a5ca","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"ddf7006637c3d8cfa0460f1f3d4a4d41f2f6445a","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.79a1f5a5ca.tgz","fileCount":12,"integrity":"sha512-FEK+AKAoA1C0zww79tttww3YgIGzUpRAwgxeaAadGXqXCWTQo0vwgEEVdaOrvz3nPOtgNt/DFypcCo7xIySt8w==","signatures":[{"sig":"MEUCIQDEBbojRirLQMmaHQ2zdRK96LihkcsBAvgn4x1ulPGDowIgJatNME1xYdR7lxszorQBnNZrOwYo3TSBcKYkh3/Br7I=","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":110625,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.4\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJe1E1pCRA9TVsSAnZWagAAU5oP/2gVeoxzZXGerriRqQGh\noRTC8m61Nxxibh4w+sCW1cUzAlsyKAoNMUUOoh/6+yfVCyIqjDQT/H5kBL4s\nHwboAiSEgxO4w5ucnOEvjzE9rVRRAboRKcsi1LW16ecEGnfGcEyrcDFOdNs0\n6Ijjn5erWxUnzeWx33SK/NiDHEUVCER5D5Gm9gp/rihJumFGdBZNO7CgCsHP\nSGGkoYxK2a2JCD0WenWrsc5eNiaxrss+i/b45qlC3Qfr3pQRqHCHHVXUGbOl\nhj/sie6JAU6t2ek4BC60THhiQfXjmes49/7qM049FXXeh43pMmGnDVQ5KOYZ\nabAIhIRDSFEWcW4jN86s8++xOzmQjBdqH6CiEUyhxWmjxE7SXmsbn94Aa4TP\nr2LGFkekhcHKLjnVnmpXIm5WaitszqP07+K0ArK3kvHfVBDwkADQOjQPYQJS\nvr43RzwX6+mQDBLkiIc8/8iQ5DqSQxnrvK3jueh5oPp/DRhp/3ExVp6O16mH\n6yGNHfaK+eqE8kn4/unEnW6acCWC2Kp+NViV4iFR+eZyf8WklikoRgbYOQXT\n/roA4ahvzOGc2PBLsJGToOgPZfLw4yLUYH+lTE7UFN0J0prM1maLNFU3tLMN\nl+kcu58sbM2u9Sn6cZBxLzqbDIem3puE3w6EQBPRrLzYN+RjEAxRXWRTV7Dx\n6YrG\r\n=BcZ8\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/extension","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","engines":{"vscode":"^1.5.0"},"scripts":{"watch":"gulp watch-extension:merge-conflict","compile":"gulp compile-extension:merge-conflict"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","dependencies":{"vscode-nls":"^4.0.0"},"_hasShrinkwrap":false,"readmeFilename":"README.md","devDependencies":{"@types/node":"^12.11.7"},"activationEvents":["*"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.79a1f5a5ca_1590971752979_0.051398742105224215","host":"s3://npm-registry-packages"}},"0.3.0-next.ce14facbe7":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.ce14facbe7","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.ce14facbe7","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"452a6b575ffb41d917d23bebdee55112ff62a871","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.ce14facbe7.tgz","fileCount":12,"integrity":"sha512-nmDvEveFB08c1jX4wPb3+w73g7tCpYiLCx5ar1IuoE0mgHl9ermvLs3PCykAMTrLLGLtB9QL02T9/xaILjPKXg==","signatures":[{"sig":"MEUCIQCHEaue7avLCdAzF6E5ra4vfBLGXp46o8RBTuoWQqey0gIgTP3uuMaL0HQM+21hDicAfkqNcbg1P2Npi+1TXsp3sgI=","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":110625,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.4\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJe1Z7yCRA9TVsSAnZWagAAPzgP/1YpSqL3KRD8NW8j+0lF\no3wwQ3AlzZguFNf1q38/19Mn+okIsWl054af72krePDgxNBiARvwuko2F/s8\nFfXUBebd2kooFpHDXgOxIPe5WsxEVJCh9TcjVA3UpUcWnd/6YJQIqNI7eBJN\nPawdyUOi/JXaf4nt4rahxxD9DSR6HGZSOelZTEd0aneu/8XFFfaJKEDaexmu\nEtnvK/9QZuUTWHiWm/BhOoC/hHuG8DZL0dywqi/rg6Ey+C+2zNum7E7AAFH+\n+T2kfbduaHf8kuKKGcnnPvCpBHgoB7Yd258f5H7xSaFAha8g2bpV87MH9ntu\ndZT0QenaTYydCssxw+CuxGMTSN9dB1gLBlrHmdZfVWEnTAgM+U3tT8/XEU6y\nJI1gyDwyPGC4ewhjZj8WJQ4+h6uAZYpjmmSd9YSVXMJNzFnWgRYiMwV6Gbd8\nmoXZDlHfXNejwH3zNK679Rj2IbkB3tc3t4U1hUWUU1Dr9jLhobflT9d0ehMu\npWTPsdvzNX+3SG8bT0qOYYToN9K7e3fa/gK4m83CUJSoMjRKJ7v2isIaq1ZU\nqAi9BDf3J3NlbIC99ZBhWcsJRDSk08DAyC9K72R/UyBJvL4b6mDSQz5LnId4\nBKayNniaZhh5TTx3mn4QTUHqM2x6ytND6sWzrRLNujW+fvxADwxffONWXE4m\n+xi5\r\n=JmLx\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/extension","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","engines":{"vscode":"^1.5.0"},"scripts":{"watch":"gulp watch-extension:merge-conflict","compile":"gulp compile-extension:merge-conflict"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","dependencies":{"vscode-nls":"^4.0.0"},"_hasShrinkwrap":false,"readmeFilename":"README.md","devDependencies":{"@types/node":"^12.11.7"},"activationEvents":["*"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.ce14facbe7_1591058162352_0.6871361869356492","host":"s3://npm-registry-packages"}},"0.3.0-next.6532cc6c8d":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.6532cc6c8d","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.6532cc6c8d","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"003e447015fa318c87d46155bcccff3d913cd21c","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.6532cc6c8d.tgz","fileCount":12,"integrity":"sha512-v9NVRECCTaRbwFU7nu4Hrxg3qkeMbUI87yJMGpEwsG580/3aBfF+p2QYi/IqqTD41M8GxW7uaILAbh7RWbIigw==","signatures":[{"sig":"MEUCIB+U1CaY4nGPcPtytSQHNXCvcJLZbAGEvE4nSUH/OX6tAiEAmcwr8kY2OjOwB9iNTaXMy23iiT8DaKwYxcAgPlqnAHM=","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":110625,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.4\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJe1vBGCRA9TVsSAnZWagAAWhkQAIzalNx05OhE/Rv0yoz2\nXZZSICIeJrGRKbEBR7RUlRFSPJ0rBrIyTyOPO48oizT1aAqbEOp1zMUeuXyS\nxkQvUzglLeMh+zfL3fwYGFgSSwGH8tiftCZay86ppAb/4CckLPMCE8jilUlT\nhWd9OfKY9xWQvPl4XeW2isMSXWap2+puxUqWba8MSBPBLDPbpg76lXzptfM6\nDhCWzfjdqid9OYU18PMAUTX+/BrjbjGJssCFrwZpTB9qVYs/iDXnCaB/bnwo\njZ5W2fe5KGM9h2j3JDHlmKxyy+qvdoZkSoZkog0l+MbrEWWgEwVpVqznExmC\n0QW55AN4okBvmvMwqlNM0vjmEfSG9cVnOMOrB7qI73qMmN8eD7WmQjcgsRfo\nkOs5+2Dwq6HpBRA0093dgpLnli6C9iyQITWe8llwOEGaXbT2bbADeE/QPPh1\nNWOTQ1f2XNDsr9uLz76oamGJtdKdlhL/yXJSJEjKfK455k/pvMQG1L7I5Rmz\nieDTep+Fx1adnHR4QEpk/4sH6LWoSESdxYqh1cIFKq46yj3yUDI40gThA+3u\nR3koj6wWSXkpOUbQrwq6hJdrjK3gJiX9nlL9xOFo9ccMD2j2ZLC9SFY/7BN9\n8gjK36qEA/n0u0beVk86PjHk3HC6HCyi7/iJPPLrAcSvsE+VcN6+ZXxIKEUk\nUCjd\r\n=hYpT\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/extension","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","engines":{"vscode":"^1.5.0"},"scripts":{"watch":"gulp watch-extension:merge-conflict","compile":"gulp compile-extension:merge-conflict"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","dependencies":{"vscode-nls":"^4.0.0"},"_hasShrinkwrap":false,"readmeFilename":"README.md","devDependencies":{"@types/node":"^12.11.7"},"activationEvents":["*"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.6532cc6c8d_1591144518312_0.7230550261754312","host":"s3://npm-registry-packages"}},"0.3.0-next.d760fde11e":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.d760fde11e","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.d760fde11e","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"6d3c92d10e83f4e57bc5a63c6ce8780f376e07fe","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.d760fde11e.tgz","fileCount":12,"integrity":"sha512-mqOSC2x6AB7G7Auae/sOlMSQh3eFL+8Ni0aLqxLCSqtjajCgMWLgX3epbdyMulHGsLoLjWTOZEx7yKN2mC/GZA==","signatures":[{"sig":"MEYCIQCYXpRvAyh58gWTvchlI/XMbD4t+ZHLSODWfpeS5YC6YwIhAK5ihxsiQ8+rASU5TKXdDj/2Uvp6u7YKEJacQ/eFWyyI","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":110625,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.4\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJe2EFvCRA9TVsSAnZWagAAvsIQAJmNKeycgs9hfHukssf1\nk7asT1aE9nVG08nzVSNmu2n1eMrd7irbao+6p/WKLSWWfV0B05Cx4I0xd0AO\na6QIKnUcqS1KTgbcHWDCraY4fzsw/K5BMRckF7RrukbqgWEGywiYL+WcUQA+\n9adoHnuZ68UsiiqsSkO/laXM2AVCmCXnamW2LNmgdceyD2fiU+lYgIknVWow\nlerfoEHvqv5MDggWoezTzk9x6GHTJGM7Ojmeh+9mkhBzWE9giaHr+R43FmqM\nxPZXcBJVYQ+caH0jGMSNE8txYBHa1fW0HkPZAyhMQgPvc5mHZuYE2vxJHt0K\noEdX/uyva7JsTnUiqwSV5mgrSh4qaKBjOUNj8MHtNyDPQy9VYBhqZwMFjVEf\ntOLEtzPfcXtOELM79LFkkAAS5v1XSlNVyvQogdcP8mOmOuDjaSgsh9rt2NsN\n71ceVYHU4HQbPCSdCG4dNq+6zugoF7A0wrJYu3eHTOqLuA/rF8ONKRaxtjSl\n+LjexZxeuSVkBdK3+c5h9+wbSS0uhBNTl/sjgbcu0thPjrY5OmKSLzgRYoNt\n6iZd6XQkImFI3eUDW1WQDjI3gA29eiGoET/QP7ChpxBldJVn4rs4GRLwY1Jr\nLWbtWjO6DBd/Oo2eYkI6ghY6a0ca2i/jmF3UswrxbwX1uFezgD20zVhwnScS\nRn83\r\n=Quk/\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/extension","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","engines":{"vscode":"^1.5.0"},"scripts":{"watch":"gulp watch-extension:merge-conflict","compile":"gulp compile-extension:merge-conflict"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","dependencies":{"vscode-nls":"^4.0.0"},"_hasShrinkwrap":false,"readmeFilename":"README.md","devDependencies":{"@types/node":"^12.11.7"},"activationEvents":["*"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.d760fde11e_1591230830523_0.2685947153489787","host":"s3://npm-registry-packages"}},"0.3.0-next.11848b40d3":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.11848b40d3","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.11848b40d3","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"02332eaac62d87cbaee7c796ddcd38990e9ca1b7","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.11848b40d3.tgz","fileCount":12,"integrity":"sha512-vXvCsxUq0v9PFNOGq2xquXnQblHS0ZVZEHGq8Dg2yQbcG4KYuVmEQkBziAROTuJZ4ac1OexG6gpn1yjEZjJUmQ==","signatures":[{"sig":"MEUCIQCQj6W61o/RN3KR2YrK2Rqc/j+vifSwwzbQ/VoNXNm5WwIgHQbhvPkHCTj8hJ4WFgVoxBAHZAW6CashcqhFKjhpxoU=","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":110625,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.4\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJe2XD+CRA9TVsSAnZWagAA/kQP/2RHw4vkzELIk20Hd2eC\nJKQzvp1WVhY190se6zbKqvz0XqZM3AchIHw5E0mERubAIk6/PFDBHrnQQgwi\nnZkeAijJ3n0cjYpNFuOCqHKenPE9FCNSJKyOUYVHZUNmhdEsC8J9yQqRELTJ\nXSPv3QwsM/CzcpebcObWxxs/Ji/bYj0lXrf8E88NbVJwno0SDrOny2q3HoTQ\ntMYdJidS8xqK7osbbfB1B1PDyH9Xk/PDJzYrXqZ6Kdi/uRB0dI70wBTy0IEl\nAghW+/N+4aqrcEdmGiCfPpnVfcuMHKwILEfVWCpOQX/P9bXju9cIt6goBQDQ\nk/RZ/hkrHleA6fj+1joiiT3bIcU914Xiw/l2DevmQrpE88i63N3m7Lbnjl0k\nQOHdk38cKR/WS6WgQNMqNNb3MSH4C5hmaOssMxstU4r+HqW7qo3oLJHvOOLi\nFeXPgq+rS4PUFmH6hsyKVrweA/Q1WHDMjKYpuE8hLogZgQmVFHcTB+G6oHYQ\n81scZL6NgRa8iUrCXf9HSLLzkkuG5PaqiFAQ7Gd6/KUsRWPjV3tlsObcCbEn\nsQDjVB1wP/v1kVQzhYSHkVLhM60OLRR0+6KCqVofbnRblOkOcHXEJs4LdtfY\nZxQno7/LWbUXNTUdSJ9A0VaAycs58WwQk3PD2dHDCE+YmuTmy5LvIpXzkNfk\nsLCJ\r\n=sMGg\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/extension","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","engines":{"vscode":"^1.5.0"},"scripts":{"watch":"gulp watch-extension:merge-conflict","compile":"gulp compile-extension:merge-conflict"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","dependencies":{"vscode-nls":"^4.0.0"},"_hasShrinkwrap":false,"readmeFilename":"README.md","devDependencies":{"@types/node":"^12.11.7"},"activationEvents":["*"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.11848b40d3_1591308539644_0.7365956468876118","host":"s3://npm-registry-packages"}},"0.3.0-next.6be6bd9151":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.6be6bd9151","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.6be6bd9151","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"bbaa6d265de83cdaf9bb47706b459cf190799bff","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.6be6bd9151.tgz","fileCount":12,"integrity":"sha512-JfRL14sQDGzYj67r5Ua+45nDlr51NeKJZMrAAEy/yQWQM+1uNdH1ID+eGQAD8lG1CbPFgntMAF41irwwS93Oag==","signatures":[{"sig":"MEQCIAWaI1k6mDNtc+NjyfwccWCKPX2oDohTC2dIolNASxTTAiApaZwQPf5GJ6KROBYrlaodBeoWWmuaisoNIUmxvBP6lQ==","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":110625,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.4\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJe2ZPjCRA9TVsSAnZWagAAE2UP/3n3D+6rLGjL9/BHXiBw\n4xaVbOqbfmGC9iHYQq9ywBquYncsrXGOvtByxdrTtSThDrfCLvDNyDPZg1bv\nuXt73Er5K6ut8AtYfWk6SdPLoPKowGaLAHf4fXccnprSt9mr2i3yQfIaFGip\nhiB/10tCAw9z8vGX7cshGqJzb0JDsA+blFUdtb91AggX9Xr33bQiSZYGRj+p\nLwQGVAW198mdjohw0POwtUUnFMUHX8WDSD9UEcYY1Opgdz8YhEX4jpfthhfV\n6T9BZdWsxKfrNFnoKbnzyujnr65iAvETht7YEDuvhXHagtPzy546SxQaUfp1\nJtq2u8WkEY4jjLW7watOEkU/7nk0FJDA6T/EHp2+dYxgLxAu2KpIXds8HzTc\nuJMIaHBp1VYU/iJCGjC0Gaya82L5S6S/Q23L7pmlLSmFmGrPrDxmNlfXibrj\nUXV/eopChBcElH3OaqQG72ytkTL2azj1v7AB3F2S3ihKWqg0Y6hQT4+IUw3X\nVOtPxUoGFXVvR8Evy5IPEByhUk4mou8j1os15Aut8Ings2Z0ozwNH8FuFf9g\njQkPgf9EYXhXyQq3CI4vaOAPQy1+UlgX1zOszK80+Mmz+6XSq2s4uai7QP9b\nb7pW0Fo7d7zQ0NnoTdE4nHzepTNLHBJ+1OKUvEM3cq+PlWqXOfXizOj/YFOd\nCU61\r\n=yfbY\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/extension","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","engines":{"vscode":"^1.5.0"},"scripts":{"watch":"gulp watch-extension:merge-conflict","compile":"gulp compile-extension:merge-conflict"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","dependencies":{"vscode-nls":"^4.0.0"},"_hasShrinkwrap":false,"readmeFilename":"README.md","devDependencies":{"@types/node":"^12.11.7"},"activationEvents":["*"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.6be6bd9151_1591317472060_0.47506650714917154","host":"s3://npm-registry-packages"}},"0.3.0-next.6fef59565b":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.6fef59565b","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.6fef59565b","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"a9097103b6f4d671e7bd1a4e43918752626cd669","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.6fef59565b.tgz","fileCount":12,"integrity":"sha512-r6Wt/zeJ037I9uQfzP1I+/R8hyY7rPh5cCuxe0RjratV27Rg/VM9fsO6aum+uAmIuI1Ym2qtCudmRH1aMD0Yqw==","signatures":[{"sig":"MEUCIQCve4crLeIuHBA3HwFY9jZJibw9TbMKKTKdBHo0YghqmAIgYA0ZvKuC4EbsmBUTn/TcHfOJnZMP/8etNxjmvoxY9w4=","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":110625,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.4\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJe2uTLCRA9TVsSAnZWagAAiEsP/1gNZtvm4QqyQAKbNXUy\nw5wS9VosRhRJOoxfduY4wkjaDBXAZ2q73SYDQWLMTpw+DflcdYfBTz0A/yJ5\n3ePma3buGMznu9ec0A2EVcAiFHTkCozhV04T0TBNGmMrRy6uC3miT3ziWkKq\nuVFdyqTSUX0y17pHl1Th0J+If9YsY2altz2ylZc63k6OR+9hy5pch2vw4Zh5\nWQjzMaTzhOuzQSVXVEZeplEfsuk5h6nkorqM6BxiBDAFHjP52YX/MeUp2gCN\n6XIXR7dTbYBK8CIn3CHZgJ6frLYWK5RFmBk9IHUEIWXFX8nmM8O3DGvBimOr\nVbCDiYHLa4AP1tRNdjDQGhtehIvWXbxFV6YD24Iu3oGjrBA7Vp2yX2PBjzvh\nxoKSYcylUkLpnMpgPUBdZgOifs5r8FJOa71wgZjX7TJiVidC7crfbgRkj3rW\nJ3EmqyniMPtarCG/x9sKstrSzC2yzbkpIhdNJIA6ZIwa650qSMk8s4z3u0BD\nfMOvlfZDp5tKm7+tw5Pc9E9SevwtIGhG+opMl+m9GQ47fk56/alFX/w0fU1u\n8LCNtEJJwHI/ZeSIwQNpnXZCbUt8a3tJEMeFpPrqvgnV9nXHSB9IWhJX/Cth\n0jef70D0I3MDtBwEXKGWtiZXb14tCcboymsF833qwoXl17ysdmm6qgpmAVKO\nlX9w\r\n=86E8\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/extension","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","engines":{"vscode":"^1.5.0"},"scripts":{"watch":"gulp watch-extension:merge-conflict","compile":"gulp compile-extension:merge-conflict"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","dependencies":{"vscode-nls":"^4.0.0"},"_hasShrinkwrap":false,"readmeFilename":"README.md","devDependencies":{"@types/node":"^12.11.7"},"activationEvents":["*"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.6fef59565b_1591403722562_0.6702081582929174","host":"s3://npm-registry-packages"}},"0.3.0-next.5347e157ef":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.5347e157ef","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.5347e157ef","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"602acf93158409eb10a1c2e7c97c5780c9860ae1","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.5347e157ef.tgz","fileCount":12,"integrity":"sha512-1EEVF7niiJbkxXlPDbg6Lt23whXE5zRGlFlQe6P6JJk0xHxQo+mFiysBXerkY8gBVOooHMDWZWTGos+a4jjOKw==","signatures":[{"sig":"MEYCIQDEfRCLu4R/u08y673w3DS3DT2wHqY1scWASDb6nNYdewIhAO93BHpFZijyYJgrsqCtvAPn/fy8xac1H6beKpCnzFCt","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":110625,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.4\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJe3DbPCRA9TVsSAnZWagAALecP/2YoLS2ZhlERCFJQ92mH\nxQQlUvusk8cC2D5rCuHnAdnNKySE2AGZYP9Y3KOPNWlr6PGwWtaENRXDhvHW\nx+UYDdM0i/3GkT2oHmsZXj3YCVojqimTkeuxYFbXT/D3PooQVmDeRUDPW1YH\n7XZLz9YM+BLKbf0vDfC6biaiPaQCnN+s6xneuEj2o8jwI6Z25nUPgClaA2i5\no+4jBMgKlDkrWOjZ+57hBFVK1dROnWZ56ZS0Fip/0Hs1/wAIRktfgDIqOYaD\n3cFDm4Ro1xVb5Aq8REtJXz07Q9vZCuYvEzLl6QKwDlKwHBxqhtgzga/e/fl0\nOt7Psah63iKTArSncJVK2o6DMrv3fbf4uAKIGJwg+YSCGB6W69Fd1BQbejY8\nRxHmPMxvMqruJ29ApzLwHOgjKCmlBe4cnFV3a9qjRszDffli0dRMMNfi6CuZ\nS1iEyLPeyHoUYBQO60XVGfYBqMA/6AmcRWhbIUjBCzwCIkudkhW7Fw9do68s\nvf4z5xZx8rSGJ1cKQ7VLDbWxpcVjOKx8SjKV6ZsyPB2fiEkHLVmrUQU6+ewW\n44UgdGEI2iMvGjt0ej3ftieaxg8T2XeYWdzEqGWgT9aBbyahGOGqDCcIWr4C\neKVoewqzoCs0yPdhplSfkpci0il3skI5IQPlEtlvq3f5xOwbi3XjUN+g3ypB\nqrAH\r\n=PZiw\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/extension","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","engines":{"vscode":"^1.5.0"},"scripts":{"watch":"gulp watch-extension:merge-conflict","compile":"gulp compile-extension:merge-conflict"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","dependencies":{"vscode-nls":"^4.0.0"},"_hasShrinkwrap":false,"readmeFilename":"README.md","devDependencies":{"@types/node":"^12.11.7"},"activationEvents":["*"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.5347e157ef_1591490254886_0.7308479660424354","host":"s3://npm-registry-packages"}},"0.3.0-next.4d6da3154c":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.4d6da3154c","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.4d6da3154c","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"c924ab140fa4c47c2f6c745f9176e8290276a1e2","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.4d6da3154c.tgz","fileCount":12,"integrity":"sha512-wAJaj9WHk1mS4xbrDBWhXDBGtJhkhBfSQxhXFC6UY3VqGqSpoDr2uMMZn7IjqUMWiyTIHjhiZ+BhFbFGDTAZNg==","signatures":[{"sig":"MEYCIQCWFE8cL12bC84HSXSlrxWslG+1fh59RluPiZmxbIy+rQIhANefbVVbcyXOHHYLOW85c7ADsMipHO7hhWwwTkdwpTqT","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":110625,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.4\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJe3YfECRA9TVsSAnZWagAA63EP/0KrEHLfxfgXrOMOiagk\n9HCwas+/TWlkHxZ94gozCFvO9mNfRMclr/RYOBQH50FPJf6pGavUUcsQX/I/\nDG9t/+YSklPijwh32SUwdlh1y9ju6/rFT+CPvGn4pis2t0gUO9+lzH9zkNUN\nPgdvH01du5fwVL7fL1NxdXnCfCl/USiMBT2lPmTZRPaYGsgh5NBRZYr9Xt9y\nij+XzACHWj96VWZGemUFDoGS2z6Pu9OLz4XmJg2J3U74BSZFr7g1Gn8cNHZR\nxYhArwgb+plt2Tc518njl14Kyv1KexxoGXyIKSN3ZLDw6xnDbWat1SA/PnBu\nhklrJIFX71rxsk0lReOZ18TTEC+xAKtwz+5sdqQW6p8R8eLn3fDdBChcnp43\nK20J0T4dVHFz6y92j4Q/jb+FRz8ss6qwYthe9RcG56e4D+3ExAF3u+7BrEvz\noRu7+uDVG4DtNNV/NqZAW79mWN4P3AfIH2qWYi+KUz1Zi15BBRP09pt44Y2R\nTgTDSHts7m1ib0k/d9F61acG8qV2Fyk/4K9RlwnrYtWdRbPSEiw8zU8XChsz\nTjdsEHzyFXBEKVeVAJISfqsgId6yeulnQz6AYTz2TTDf2ks8AsDZEqYrTHbU\nGzOjJ46wDg2PP1YR1jqI6sLGFvd0i91LP9CUv7yUdXxVPPbljcNIlgeEIWKF\nAO/6\r\n=FgBR\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/extension","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","engines":{"vscode":"^1.5.0"},"scripts":{"watch":"gulp watch-extension:merge-conflict","compile":"gulp compile-extension:merge-conflict"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","dependencies":{"vscode-nls":"^4.0.0"},"_hasShrinkwrap":false,"readmeFilename":"README.md","devDependencies":{"@types/node":"^12.11.7"},"activationEvents":["*"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.4d6da3154c_1591576516028_0.5987358674251535","host":"s3://npm-registry-packages"}},"0.3.0-next.2aa9854ac4":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.2aa9854ac4","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.2aa9854ac4","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"3ffb5895458efdd6fb4dc525bb4d2a96eb3924c2","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.2aa9854ac4.tgz","fileCount":12,"integrity":"sha512-BY0jshPd4nFmoJySFzyuFBKDBwzb3GicCByBi0/81ia4awngdkmZGA+p8ghUDrpyhZSYm+VSwnzh9ESsABgsQA==","signatures":[{"sig":"MEQCIBTOpj7AEYMSHeuV6skDzoscD01dmziB23bTEDKKrsFKAiBC0et2AEBLPd5CQBclmrL6fypSOCHvYnUEtdKP6eX9qQ==","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":110625,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.4\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJe4CsYCRA9TVsSAnZWagAA7sMQAImuKBJ64Jqr5gDoj00t\noeKHmsIELzvn2utoyRtJE1ECTHxQo+uwG6RRJ6S+9a8XSLKUkg0rUJkY967y\nzKQ58Wy6mWKWFrLSQ8iponEFhiyJcWiX5PtJlUjmXxs1GJxzJBYTdlf7roxT\nStIN6woo3nutC/rQLfx6wT8zVhCGEMOF2NdTVWGypt3fV4cd4Dz+hHM3d9ab\nQ1S5q/B0tUxV22Y3o7kzOGKl/u6UQGmZWp93qFp66WKbiQ7H5su4jy50RNc0\nnPWQqzk/4GLLqdxg9Y6jVSp6h8kdAHgPNLQGo6HMlfMHVS4l8M2Ymlu4bCcb\n9kC9awY2GQeOVupzwEb1ML9dY4uGVuzNtnnomt+nwuyq7HLqy/SAa46VQjz4\nwUrGO5ao4rNq9m2i34Y7hVaLa0W24Vwh5yB+4YjLcIhcbOYG5UrSDLuUbg2O\ntEnSzeFsoDx1NhHRWJ/8wVYcJD6W+jWkpeyifAVcmL0ndmSXOn4AZX6ir80q\nT8LrfZdTEdW4O8yfkD9HMbvIcdU7muLoO+4sZyRb0s33Jgez97Smm2cPZWR6\nAt2b6BTrE+H7b40NTEXdmiIRVd9bm0btJ710A0oj4h0u1XQ2xCicAYtsF51V\nq/70Cj4yk0nymOjN3SLbKqlYcKHONWR27zy2EqTpiCJjQL4geGfP2HJfBUoB\nPBwg\r\n=QXGV\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/extension","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","engines":{"vscode":"^1.5.0"},"scripts":{"watch":"gulp watch-extension:merge-conflict","compile":"gulp compile-extension:merge-conflict"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","dependencies":{"vscode-nls":"^4.0.0"},"_hasShrinkwrap":false,"readmeFilename":"README.md","devDependencies":{"@types/node":"^12.11.7"},"activationEvents":["*"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.2aa9854ac4_1591749399642_0.5653896962808032","host":"s3://npm-registry-packages"}},"0.3.0-next.0145e38e5f":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.0145e38e5f","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.0145e38e5f","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"5500c4256cbb3cff66d36caaee3b358a8c4699a7","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.0145e38e5f.tgz","fileCount":12,"integrity":"sha512-IhrbtTMeaA4smfP5/AFTmA3EKIN/H1M0uJLRFLQ0GnB6mUxX74jvIOr3RBckngh2sfBXoM1KIAbJFd/fXcFnzA==","signatures":[{"sig":"MEUCIAx5BBCTCBUXpHjnMnnfCc9VhZhqwOmWSs1Qr0X09w0fAiEAl9+zM/aq+etFr4FwpP3HNK9QUWJF418THGtCndL42hk=","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":110625,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.4\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJe4X0QCRA9TVsSAnZWagAAiagP/RLQZamu3W7pC4NLGEZx\nNewhLyep/ZzTY+L/yBmoTyymx8YDhuoUnnqe8O8Olw0UNEBomV4ZxsPlCtOs\negIKyEjdJagW7I7Im8DtPB5DuX84x7t6NxIFlJHIfBbbK4tF1je4YgIKtLUt\nyGTzYFvgvXX4zn/Bl+gUQfzozoEZxLqgKYcNioh3VRTvN2kgdtqQmg6fdkE+\nIwQxsk1MubnH1bSaYLejs09/cVFbHw62lt+ux2vqHZqVS6GKV+ctZ+O4pS98\npMTgAjReBS+QwFiixRooEJiZalO2NRPK9P8ENd5+SN4GmEewZBdBrRFt+RkY\nnCl6Stff17QwVDSHcGg9AbakSNg4WFWbHgxNA/kmnuQ5DVPBL2WRzRX4R0kh\n8aRsvVrLTOKicLsFy7gs3PqDud20H35XrwyH4c7cnCCWhs0Xl1jSkCvw6tKO\n8B5rk3+1eEVOgLIkzuzrlQcFEzZbeHtRhY+jyBKCym2wSRX44mSmiXBzhFfS\nArK6UXukLcGSAzANl4ghdFixbb8bqOaScour0QXIRlnoyJSuvEocfDSRoiS6\nnj8Q9lcv62SeU+k/y3to4RaYPTVX9nvzz4zssIQcX8U40IoggaR4Khv0AoFK\nw+x8jZMWx054ZpTAjePglhJ4DXadRNdwEQEJ5o6uhpuQuPHh1VYvLlJqPCzE\nWNOM\r\n=HPqk\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/extension","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","engines":{"vscode":"^1.5.0"},"scripts":{"watch":"gulp watch-extension:merge-conflict","compile":"gulp compile-extension:merge-conflict"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","dependencies":{"vscode-nls":"^4.0.0"},"_hasShrinkwrap":false,"readmeFilename":"README.md","devDependencies":{"@types/node":"^12.11.7"},"activationEvents":["*"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.0145e38e5f_1591835919899_0.28291054832262086","host":"s3://npm-registry-packages"}},"0.3.0-next.1a1ab8a435":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.1a1ab8a435","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.1a1ab8a435","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"6dff3406f830488361bdfd1f0c0c082c4a1e60fa","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.1a1ab8a435.tgz","fileCount":13,"integrity":"sha512-FoPNIzv/iws3EBY4Owk4AINV65F8hdcnP4/M4BaQPl58CkWu1hKe1kKabfuZ9VRY5NjhdtF9CRMwTwecGQW/Qg==","signatures":[{"sig":"MEYCIQCfofcjCuWL8Yd4W12qg8qY3kwFxUzdSPM5594ovyty4gIhALaUPnyVAZiIYmkIp8OEqWnqQS15DBHYNA6G5BCcafZx","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":111554,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.4\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJe5B9gCRA9TVsSAnZWagAAljIP/R0aIgjyJDiWL+Z4a20d\na0n0Wtpp1Y/0K2F+Wig+6prHMqMNas7gI4aBJSivTZ87OHsrhqxX7IBEbISC\n4rw0AQU03biBv7sOkJAlxod4ug0laTa+hxjmPa7W404cYE8ADqwscR7pdRP4\nctutn38V5+byBQPtxMrty3w6gE126jMx4673zeCpT5mjBOsj+NCQkgXJcTU2\nQaNUfn+hy4ONOD0bvberKxIuNJXj6yq7P+JoX6++HSckdAP9zFWH8+xaNQ0C\nGz78hKdoo/Jo9/fJCO76ZjWc5S9AF87l5pbe1OZlpwNDYupcjzjm4dRpEL2m\ndIPUwioBovxUb9/bzFKANK+SmIudrGrXwF6z8af+fHYVIAUoLxeFBUr0Rvav\nzyolu8kqlRFReUGI+AuE757H0hKmYhMCiPeTd5P4jQkKj4vHNDq5tpIj8YSx\nhwfk2TKZDk29kzkWeNJB9OqOWClhh0GZ5LKV87Q5iDfX++l1hLqzImw8TyH7\nrS5m5KGpgU982QbLt99KLaIBNIa5Rvsfb5FMqWnO0NVc2s1wcbXsDYO4GAK4\n+Zf8oUNYojkMDERn0LzE0wPkmk8srLIbGf+b1/Lt6SWdpP2JQEX1chTMGpgI\nCNA1KGRsd9/0IoDMDMkzU8tym+CObTqwPJwfTKA29t8pI8HBYR8JBqiC6nhc\nnnIm\r\n=qmXy\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/mergeConflictMain","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","browser":"./dist/mergeConflictMain","engines":{"vscode":"^1.5.0"},"scripts":{"watch":"gulp watch-extension:merge-conflict","compile":"gulp compile-extension:merge-conflict"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","dependencies":{"vscode-nls":"^4.0.0"},"_hasShrinkwrap":false,"readmeFilename":"README.md","devDependencies":{"@types/node":"^12.11.7"},"activationEvents":["*"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.1a1ab8a435_1592008544228_0.12149649374542437","host":"s3://npm-registry-packages"}},"0.3.0-next.af9d0d5df2":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.af9d0d5df2","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.af9d0d5df2","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"bf1a5eb8099faa79a6896d64e78a6b388594d37c","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.af9d0d5df2.tgz","fileCount":13,"integrity":"sha512-TkgyZ+ie3eyFqfynmS31wuoDA60sRSCHIl2T+UbM/Kodj9soZpkq/UoTRIPrOo8KdSxZacmWbG6PSRXSeL80yw==","signatures":[{"sig":"MEYCIQCTZLf5E0UI58zJe0BPIQwxKjg3xfXjmdEoNDE0jAXsNQIhAMMIdpTW/bODDduX2d56xrDFMcO3CFnEQpWfl5IJdKdc","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":111554,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.4\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJe5XFyCRA9TVsSAnZWagAAyh0P/R1FuFdhHZ3Yt7Gc2jF4\nzNWQ8+NIJL2C9oFoa0CkvLgF+pYCOyHVNknh05v4yRLiM5mP9sKItlQUm1ay\no3X4Z5eMRYfPmcuuVOSA+ltNV1hB+jcdsg7S0FEAedoPrxNCIEA3bO15tsRP\nx3aPBbjhHRYrL1dbRezGM7QR7CFU7SdGdFiMv+jsclK9Sao6UhpoWENHuAR8\niyC22ykYETfI1gxx3Bmzub/LwYRYzXTxSb9dAKtWOfPcozP1DPn4k5ZkSnpV\njS/UF8qy2EZnXa4JIfLNwB0fcIG/zWJF4wSaCE4WqsItozheNqCnAbLZ4hbS\nOTsRaQ26NeJv5mZrxanbRfxmzaKtSRTiIEnYawBuTrTJ13rshIERwuUdzPje\njWzSBBaK3al131aFmzI/6FYOGj8p02yCLf6SrvCpfONu+6ITRFIO1wzLCn/o\nrnhyAk+qSDE0B1y+YN5ScmjgNaZkkaT2K/K9CWWI3NYUxxJ0li2P//DRR0Fi\nJAXMlsZQF2KaVKMmynnNPir8lEMLkG30eAO961e6bRNPPyGVVGWPb5Nwcvoa\nUz+wOgXxNQ94hOOhdlnQkUHUSM7gRdmy7CFy6qDybgpA0wDiup6c5CLMz31M\nA7CRn/6Pea7oREhHxegoanVL4FHQgaS2PQilFTXmN+qcJt3jAyq9p4AZDt7c\nfaau\r\n=L6h3\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/mergeConflictMain","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","browser":"./dist/mergeConflictMain","engines":{"vscode":"^1.5.0"},"scripts":{"watch":"gulp watch-extension:merge-conflict","compile":"gulp compile-extension:merge-conflict"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","dependencies":{"vscode-nls":"^4.0.0"},"_hasShrinkwrap":false,"readmeFilename":"README.md","devDependencies":{"@types/node":"^12.11.7"},"activationEvents":["*"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.af9d0d5df2_1592095089765_0.06700990607435364","host":"s3://npm-registry-packages"}},"0.3.0-next.288447572":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.288447572","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.288447572","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"9de5f2b419b732352da9a4e92a15e3e05ef16633","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.288447572.tgz","fileCount":13,"integrity":"sha512-7M04MyzQ78deNT595IkEnFSlk/Wfgl0D0P2fA9nu2CVngM9GEjLKkOktlIqvWqW+Jmy2f6qZyWG1NKbUuge0SA==","signatures":[{"sig":"MEYCIQC5f8tV4oc4+Hz650UmBQldbcU0gDx31qxaip+WuDvdhgIhAMWNbbyaUD9T9AeZSkPjIPDGk9RAHGZTlrR+/Q930SU8","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":111554,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.4\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJe5sMMCRA9TVsSAnZWagAApyQP/3zJOcvSXtUVWhWmG+ZG\nJQLr9u5HoGNlXmIv55Hf07n/Nku2oqvGOQp8dm5YZsypp8ZyX5NK1wjgtb32\nfV9RUKkKT4sAyt3H9W3ejKi0MP41mtEXfnWHclRcCzRwfjlAETVnvywfjlgG\n5apP+5k0fyihiFIrkwZvL7B/lNsMfTOQ2EADE/Bce1szzAbfV78oo+2RwcyW\nZyJQoS2N/9OJl1bSXttX7TGX//lL38lunc84f8TTDauqM6BQx5Ad0sMU1ElL\nDCosXD/JoFGjKACQUOIp4euy0RGy6FnQeh8sLn8iN4hkswOzaJYMolHWB5eK\ntrFdY0Q+CEObFSRk6qNRFIIN8B6u1xJo+1581hOuKf4R0Jr9HFjCqJy41j6q\nn2zaLZgsPPGiOCK7jUlB/ErxiOgX67nBfgvOOOUB0IGiDzOvaHQwcsXjWf5t\n0aq2kxdY3Rai5fUCG3YoMN+bAR7m97DBxRuDoCdRlpUw40sEo+ATNMyv6DP5\nk2o75SN59QxX7T03bmnK9g1I6tUL3Pxt70xmRs+Xnr/Jp8XW3aj20xY4/B8h\nm4563Fi4JLrF3nf5pgp93/vx8Wj1bZJqg5Bnmhbq+ZzDgWq6YH+0DSjR2qaU\nPuQL2ttI/f28VKS5h9tEtRaCxYrehotCSUqF8uKkTLFcgXPEljb3s1RWKy2b\nouT6\r\n=M7HS\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/mergeConflictMain","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","browser":"./dist/mergeConflictMain","engines":{"vscode":"^1.5.0"},"scripts":{"watch":"gulp watch-extension:merge-conflict","compile":"gulp compile-extension:merge-conflict"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","dependencies":{"vscode-nls":"^4.0.0"},"_hasShrinkwrap":false,"readmeFilename":"README.md","devDependencies":{"@types/node":"^12.11.7"},"activationEvents":["*"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.288447572_1592181516324_0.9120450729646008","host":"s3://npm-registry-packages"}},"0.3.0-next.9dde49dc78":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.9dde49dc78","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.9dde49dc78","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"2d404b79ef25a3cb2257ffa749f0b0659a9732a8","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.9dde49dc78.tgz","fileCount":13,"integrity":"sha512-1VcpfsLVraWfAgdF5Vh+CPwZW0k61buotLqLDRskbrxzlhCNf6mHHmS1YhVJnUZ77gygYtQyuuxh4Z6uWSfP5g==","signatures":[{"sig":"MEQCIAIkRLktXlsfVyIIA6B3/8ywBnsxrU6VzRmc75FKbCvgAiAbeozLrcbAEyV6rmN+cQ17xUomjMz3xe6TefVIiMqvBw==","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":111554,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.4\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJe6BOiCRA9TVsSAnZWagAAfg4P+wSA4EseNKCOfRrqkExm\nq1sOAKLqgrtQmFkKOoMi1HDT4aBUfgWiKvKwBThaur5stA7hCLLYDfpVVlRi\n+J2HhlEb0l4StGL74fcICThEzDs8ztoVkWnxyoWoifgiIJWeRt0aJtGuhFx3\nVMLm57wBJZCs4Nujt4nQboCRb6x0lkiD6xzLlK1zUNAiua6XFPTlRgMR+JZb\nNUD5iofRwlDQrxMEgUReaI7UbUD49SaeF2aZVOnM8c4Pngygnlbo68IM2Ezq\nsWgSQkT6/HjjwAs77RWmY+pon9rGGWbSLkUnCOtgywHWkHbEv89FVhoh3kee\nStzS0U5hABQCSZ2ivbWFJ/f7PHnHUig78Xd0uOEjdqBulS4p0RHhGvC2yDUR\nytHNB17Q4Hd7RoDXIXZwmkkhMbCPGKyK+r4vty9sHev6Vrki4/vR24cR4NSV\n6se3vZUnMgaorVj/3AcvCz0NZZMQE3GOMyDVsNroyR5b7xSKO857J5r594pw\nBRklabYHfd48w6H8AEPDXLOIqC6DNC83ahBUPsOWTBOU4EktjiW6WxXC7AJ9\n9bK/TSLYABOwY/6rJGSBY5P0mQrBpvDYAGuZJdzR5J4R57cPa6qXQAIFzYnY\nb+z4SVYyl/YxbjPwi26GwOcJm0+7kOHkyOSAe7tkvks3Bz5SkSvtiYxkubrA\nkPF+\r\n=9D4/\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/mergeConflictMain","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","browser":"./dist/mergeConflictMain","engines":{"vscode":"^1.5.0"},"scripts":{"watch":"gulp watch-extension:merge-conflict","compile":"gulp compile-extension:merge-conflict"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","dependencies":{"vscode-nls":"^4.0.0"},"_hasShrinkwrap":false,"readmeFilename":"README.md","devDependencies":{"@types/node":"^12.11.7"},"activationEvents":["*"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.9dde49dc78_1592267682360_0.5742354361052118","host":"s3://npm-registry-packages"}},"0.3.0-next.ddb6641923":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.ddb6641923","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.ddb6641923","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"82ec9cbe68a8c0def04fda53e3d8adb1a4db7624","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.ddb6641923.tgz","fileCount":13,"integrity":"sha512-sIqNQLdW9ZTbAe5sPscbHT/IFX5E/M9H0H8j8oiLWWgv5qFv3sacQuC/cQ8UeaSBUw3/L+Tw3SBEajj0N2BmYQ==","signatures":[{"sig":"MEQCIEvUKLvNYsdtAp9toJBUrHd4P/c+douY58bc2rvnr1piAiA8pAT7/lB/0mgSMTLd076O6PG7KHBJZI4adxBpQABBkw==","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":111554,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.4\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJe6WWNCRA9TVsSAnZWagAAQO4P/ijW7vSdEeja/vsqjwtv\ncXDcoZ9HDhw0QiCptQZuL8ZWyZvO7e4dHLo9QFRvkHwPMyDDoDYDvq+MwFjY\nfg24T7zj9RrhaI+LmRSIRrcKYg6VMoS4FvIx69xsSu0DdVYEmInPt3QMJoSD\nkeYwD/LP40yz8lRUOWuT/cCGWIrEcEykR6b3nUQnVR680F8/w3X2WSzOwhgA\nWqNcTwkNAJ2VOklzjQr00gAP9jByEZrcFgqHZgUfk361mbPNR+Ji0nrHltP/\n8mVRqAONGckzWgzUFUBiaIReDXzcXIMptDAkSTU7WhaShJL9R4vUzezEV0MB\nbNog8RUYcF6HPELVF1WW8PnvgtLPB9HdnoBD8r+0mi48VKjVWtvGhMsvdppM\nVIdTamBuy9OHI0hBA3FOUM2xUjm5htMlvozVRkT9Xnyo5SO+6ARC5rGo2bAA\nmT/VzaV9tEli+Ya9FPEJqjnFujl2HpjAiDt5sOtaVHs/ArZUSy085b9Xh17x\nQ6Zjt/YeTosjGT+jVPrU4em8wWMZQRABqoM9zqszORZm8cPwyMfWc69TZ3um\n3g0GQtE346o8sO/WNuwnTeIeovR+bfndCMSHYfAbSdGxh3wTWXCEYvCpsGDA\nxlaWkQ3QlzwGQvfwznVlyxhkqivugxoZJv2532jgplv8Vsl8RXTJdn5JkWix\nocKg\r\n=aqP0\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/mergeConflictMain","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","browser":"./dist/mergeConflictMain","engines":{"vscode":"^1.5.0"},"scripts":{"watch":"gulp watch-extension:merge-conflict","compile":"gulp compile-extension:merge-conflict"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","dependencies":{"vscode-nls":"^4.0.0"},"_hasShrinkwrap":false,"readmeFilename":"README.md","devDependencies":{"@types/node":"^12.11.7"},"activationEvents":["*"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.ddb6641923_1592354189006_0.025227010412525397","host":"s3://npm-registry-packages"}},"0.3.0-next.6c68514534":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.6c68514534","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.6c68514534","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"3a8b01fc61bcb58da186fc66676f6ac8496c3c78","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.6c68514534.tgz","fileCount":13,"integrity":"sha512-X71B/zgRo0hsEpMfvE1kdczYFRyflaZTh3KRdE9zOrjriqMt+Q1k51mmY37IoulakOYa5BvmowIJFypTInlgWw==","signatures":[{"sig":"MEYCIQC8KMCqqY/8lXiHq3dFZ4uD5LMa09of1Qm3xjyzgwfgFQIhAOdmFJTU3X4hbS9jVSJwYBan4MF2GPHmMCDae3Hh8Al/","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":111554,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.4\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJe6rcLCRA9TVsSAnZWagAAn2IP/iNajz54EIiIDIw/Xn48\nEJ75dCjUbdqksqKY6sW5NHsXwEQ5eAn/EReYQVwmM28RWPaZVEDJOLcLDS4I\nqD9xrbc0QAMs35iXszwlwcF3Pk6Pj6x1BB+cRmaBpyDatNylg/5alHOm8Ykm\nBU9CffFit9zlPrybG0nj44+IAndX0BqEZYPO6p+gw83hbG4UX49Fx3XkMcdT\nZLjKpn8gJy/z9UWmKz6iA3VnlZNgEHq+T07UxOeLDnMSWP3z9dNgHJgTg9VN\nCPRjJcAj6qZ8o4PEzF2T3BJQSI+ieY07Gw1bwlh2fyBU7tik52FGqYgbz5A2\nkq6NITUV9H/5KKemzTJ7iSYIQNnTJRIfFgYbxTYShMrFu2UaaQXd0326OGg9\nMcR5ELsSoGNcB3Zpt5UZPbS5jvll12epYvLHNtG0tQQ4j9Dv6/4RF/Lu4iSI\n1zIONp05hTyOjScwZaZb6aBGezBdS1ZyIc3zUdRQMz0z/1uwydRehdEK8kaZ\n/2vq2mW7A3WR1OLuIdPDzFuLRrTgQ5C780iTAuQBJ/1jku38pShFFtvzFwS/\nb8CfSlqtlgGN1PA+dogh+IvoMMVGuEybiexlkGlrviHIaJB1YDabpOEGs4CP\n983rSx4BtWyny2jCkeNy8qiWAcw58vEPICfpg9xL6t1xbEqmDo0ggv906S29\nuNXX\r\n=HUxz\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/mergeConflictMain","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","browser":"./dist/mergeConflictMain","engines":{"vscode":"^1.5.0"},"scripts":{"watch":"gulp watch-extension:merge-conflict","compile":"gulp compile-extension:merge-conflict"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","dependencies":{"vscode-nls":"^4.0.0"},"_hasShrinkwrap":false,"readmeFilename":"README.md","devDependencies":{"@types/node":"^12.11.7"},"activationEvents":["*"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.6c68514534_1592440586788_0.7907506573065122","host":"s3://npm-registry-packages"}},"0.3.0-next.8cd3fe080b":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.8cd3fe080b","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.8cd3fe080b","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"7650e522d71fbd38583d6d5c61afdd92528e35f0","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.8cd3fe080b.tgz","fileCount":13,"integrity":"sha512-g7pnU++hWU4ZLeFN3t0s4j0THHLbXwS4UwaLPuwT4fgJ5KZA7ThaQRK0WhMwk5ElMI+2L7NK+35jJouYFKmOoQ==","signatures":[{"sig":"MEUCIQDwAahiXM31wk+XKD8e3IbrAZQ8edmRiK8ZuJBIZTfGiQIgJhoPpe7XnVFoG8LS7e0peqwCVPOL0YDlfl0JDIVGn20=","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":111554,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.4\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJe7AieCRA9TVsSAnZWagAAzVcP/Rd+yQEZwhbg7lQkkc5B\nKbeXDXHtMoHoCn01jV9XHn+W8I72GhFX9hUtLJ6SZocj+OSICrx0cegklS2I\nQ1Eih6WAm9/AwV4rPcgUxRbQxFmMVUn0xpTDepfy7fB8TMfz2sy7O/nSExU3\nzmKWxnfNuQEmR+1csdJNehT/PpXAso1T7MHhRBMHRsdzsIYZvQ/ImAc1/Gze\nAbZ5BddreSvivqzct1SazYDIuRPV69NcIXJShcLtWZUn0DZ4zs8ma42jqMBd\njdJq4hK3P22ER/Wg0jLUFFpSfVjCjH/kZMS8wJJQZEbkuXpI/yKtREeu1zFl\nc9v0ZDsHlc5ND2vlCTSs7D7esfzN54zC+A3v7puu3Nm+ct+rflI3PCv5kqTL\nXevIefPz7B5fLoY1LDHRgaDyXywrqM40YO+ninbq4dFsmZQjHmyR2ANTVWbh\n9qgD+c1PbhJiKTZU70Lxz29ktOBBsd3z2iE5i1l/hkVX7KzqWhGBNzYnz2oE\nBhKgeKo7Xk8oWD6UFRmKbp2ilycsdBMoLf5XofCKcdGKO6m5TdVXmQAPQ/mG\njNP5heCIXl0mSLDY3J3hzxO8Oh5HpAriEUxmcjuxF/Q8vUqqJJreLXkqE8fW\n6R8hWgU7L7MdEdf6k3NRGMTGUH4jbGIulU64fB10dUJ5CGhVkAmbU5M0+rlJ\n8s3v\r\n=6OlA\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/mergeConflictMain","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","browser":"./dist/mergeConflictMain","engines":{"vscode":"^1.5.0"},"scripts":{"watch":"gulp watch-extension:merge-conflict","compile":"gulp compile-extension:merge-conflict"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","dependencies":{"vscode-nls":"^4.0.0"},"_hasShrinkwrap":false,"readmeFilename":"README.md","devDependencies":{"@types/node":"^12.11.7"},"activationEvents":["*"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.8cd3fe080b_1592527005839_0.7531550952534303","host":"s3://npm-registry-packages"}},"0.3.0-next.97650fb8f3":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.97650fb8f3","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.97650fb8f3","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"4c7fc5279a8eebb43c46688b08ef8620f3ca0b93","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.97650fb8f3.tgz","fileCount":13,"integrity":"sha512-SX5mpte+CiZ9RTc1uDYa0AVr0ekvi/jzWCZ//W9YH79MHP1hLCVFrpk1WT7EKNnm3DuuPpijWCVMQqOmLpWIkQ==","signatures":[{"sig":"MEYCIQCl+5sea/h4zXsnOBe9ju/cgkPjI8QGJORrzFjdicL9tgIhAPox9snqxR5jw+0uOB/Q7hHPDy/gjM+XIh9ioa+l3Bx0","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":111554,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.4\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJe7VoFCRA9TVsSAnZWagAAmlwP/itoyuIlkSWWztQ1S7li\nj6cCgjDvLp+EhLbPSKWmuRU5lF6bcOJfaLGD7AVRv1x0nr/+K8s3/sNRGZUA\n3D/Bpa1jlFofUbQFhEzLTrk5fKQ9LUF5b7cU9+Clg9fCrgMO41gFqyaSeeGZ\n5JsrBX8fCIUyGl3JvrSSXT7CPyegTldjIaME60cujzSIxZwntMurZwMshdnt\nWvdmCivbOZqecYz/vAaakvH9XkwHEAoJ0GaWN4CnCZZ9wERExVRWDVz/XxcO\nWR6D2TeH7ugowljpVPQMZNoS/X/QiR/YWTOZGcm+J4ebuLK1qN+/mjN9KUo6\nIieOqgtbA75MxTnPtAH/kXTpO+aE6ZvzF0PqqDiXB6ahlZseLDAosy5ZCVWi\n9Zx6nnnRjJB7TeBHOJ95+navm1/HtJMX+ToJ9rrYinx2H7Sk/8Ue0WM7ggGk\n1tDLiU4DYhCCHqzq+9k6OgbsRsMnkULXwmpzmaz1gMM05V5g8eCpdnN30MKs\nBqF+4lHNevr1TUoXxUfxGax1ISquhMg8ZmhOZqgJVeUO3d/vGfYKSHH+Vk8N\n2h4lUA/KmT49kjo6+5dHn0X/eYhqs3cHAezKoc5+5n4VxeQPlmzMR6Bg/Jz/\ncYN4pMCMbEEMUwimvzu8zqaDSu0TQHfOdhqAGYiXI80BPRcPszPtzXAZnNbd\nrYif\r\n=CJGp\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/mergeConflictMain","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","browser":"./dist/mergeConflictMain","engines":{"vscode":"^1.5.0"},"scripts":{"watch":"gulp watch-extension:merge-conflict","compile":"gulp compile-extension:merge-conflict"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","dependencies":{"vscode-nls":"^4.0.0"},"_hasShrinkwrap":false,"readmeFilename":"README.md","devDependencies":{"@types/node":"^12.11.7"},"activationEvents":["*"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.97650fb8f3_1592613380260_0.8175065999876754","host":"s3://npm-registry-packages"}},"0.3.0-next.9c142ea383":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.9c142ea383","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.9c142ea383","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"c455316ae92a4c238ba59656690ba39e8fa41d17","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.9c142ea383.tgz","fileCount":13,"integrity":"sha512-VHXkxzWl93WeTXkFXFeCYXT5LDGsAm/eb+sHr7fQg/ivTRWktzn3v70Onpt/nU5OjVaZ6p22lLDNMdzWZ8IG+A==","signatures":[{"sig":"MEUCIQCVRiR3ca4ViNzTPnLIw7sDvrpbgw33nQ30bbO8TKcHWQIgKRPUuaV5zUBWQzIuUZiEkABA1MXZY1Pr5g4CkWBL96Q=","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":111554,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.4\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJe7qw0CRA9TVsSAnZWagAAOAkP/1hK9QNiW0v99Y9HzoDl\n+Fqp1utjdYpprQ3IKNgym8dDbmouMJ8/l2V7vyP8EimO42XIftlJOQoRQFl+\nlZuv3Hj9/pxkBkAwnV2NfWs3hYfSDCRekRLxSm4SGatkHeJsqD0Fe+syCBNn\nLQ6ll6YpVkZ4XMYM3R0RWN78BkvzYhzKSIK8ozEeU9TzFHGywae1cc+JgmMU\n17ruR9+RGUiicRttWkU971nYHrU6P+i+IDPyieQVBeoJ9cMqZY7jYi5qthTi\nLK491mfJkH+tI+1mzC7G4inh79jZmfg6ZVQdMO+Unla/KWzUAau3t/53SsbZ\n61OuwCxSKvnpZLRmNQ6b1LFw8i9qmgXHjnQRmHcp/IkWQet5vBy79PjYk6jb\nZkIQwhYQsZ0537awhghev7OHA3l/p91U681fjGmwhEAFo1rtyP4OzROALFtw\nIPeuho7sq3dPRn9EjYsTXahHPlcf1hUf+f0EpQaPa07Cizo82Lphi19b4i7e\n/6YdBKOaXt0gBnLt6TdqkwTp17rmMbpdE3hOAeEFlOTvdH6vhAZVZ8zh2QIZ\nKm1psISlNdzMGmq/fBsTHptnjtzPnC4wDHCxypEp0FzAEFgAFLYQL5hFNjTk\nfASjQnhHMn0P4/r5znUzYoChfM9VJGlclg4fdhTe248y305VQQ0v4B4fV3+l\niCv3\r\n=RJX5\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/mergeConflictMain","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","browser":"./dist/mergeConflictMain","engines":{"vscode":"^1.5.0"},"scripts":{"watch":"gulp watch-extension:merge-conflict","compile":"gulp compile-extension:merge-conflict"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","dependencies":{"vscode-nls":"^4.0.0"},"_hasShrinkwrap":false,"readmeFilename":"README.md","devDependencies":{"@types/node":"^12.11.7"},"activationEvents":["*"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.9c142ea383_1592699955965_0.22226518155581898","host":"s3://npm-registry-packages"}},"0.3.0-next.fad4d8d254":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.fad4d8d254","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.fad4d8d254","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"802952280cd1f21c1240f29c4d87b578d2107fe4","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.fad4d8d254.tgz","fileCount":13,"integrity":"sha512-7j9xjLwMr/IQUHXQaHVgsCkbCwixN9tqnnqQHGBttTwCdekbfzUV05wZnS2bxSH/sHjgUS02xC1uaAdgP2A0Ng==","signatures":[{"sig":"MEUCIQD1jPyeCv3VlxTCLcAg61rydpWB4Gn+ukeSawt+hbvTAQIgQA5pERBEk36edbHmlM5inUMwroUygBlDnZATXX/APL8=","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":111554,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.4\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJe7/0VCRA9TVsSAnZWagAAhv8P/RrMtMN85zlYgZHYMH/8\nlcIz26+SJN5miLWKG//Io5W4kYrVkdKXKhArcL8AAufydMQ02c0bBY5l5AmB\nGbyjQ8Z7DnJ6PAAAorj0/3J9TAAx6yKoRPsYVSFf0gUKAUTEMUy1TKrbroWt\nfMkjmfilkYlNzshdPoyFRrOnwa8h/WVN+cDQ3x5Kt2w5BvjKdu44HveA2fKX\nnabecy6HbRz17Eax5HgImPaTwGCOMzA3rIyQluncjccHujM6cyOqTQ8m2LJE\nSyiO2C7STnjQRbIfRc74PV1GHAyOHXfk+BWvDicbNBvFk3WL65FFF0z6iYzD\nn59ACAW8/SnXnBmowDtM5gyGVIONXjgpgVo5LBDZuA41yMQFkSpbUVPz+2sP\nKzgbgBap5mrfvYBEqcQx8HAkRVOwgk5cqsoKyM8jRhpdCEsWIQmjozokozRD\nOym2YRTAh+hIgib+RDECmkWtLofLJFXT7Zk0TXsmEj2QW1G+5oLSYNLR/dCn\nA1lZrb0MoMUPRAqbRkaAPc9y9O5Acs01ebxlmdGO41qFC/Jra2XYXjS/eULG\n6nKlnZy+2jfzayjjaVvev/y4oMzXqQeMnz08sbM4A+e/+wOiIlTuuo0+rU5I\necK0H8XBroamIcIQMS58PbxdR9/sYR3wlMcH9MbAHZmoyON9lWNCCuICq56U\nDb+t\r\n=OCF3\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/mergeConflictMain","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","browser":"./dist/mergeConflictMain","engines":{"vscode":"^1.5.0"},"scripts":{"watch":"gulp watch-extension:merge-conflict","compile":"gulp compile-extension:merge-conflict"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","dependencies":{"vscode-nls":"^4.0.0"},"_hasShrinkwrap":false,"readmeFilename":"README.md","devDependencies":{"@types/node":"^12.11.7"},"activationEvents":["*"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.fad4d8d254_1592786196948_0.11203829702093415","host":"s3://npm-registry-packages"}},"0.3.0-next.593ee445cf":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.593ee445cf","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.593ee445cf","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"8db1c7c19b5cbea093cc13093bfa776c8f88cb4f","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.593ee445cf.tgz","fileCount":13,"integrity":"sha512-Nqb4CihwvMW/teno5cicbSHbyu892Ccyp8q0dNYdLqQWSrBpRAOnab+OgNvSjLaava//Avx+14l0dLLR+W6Dug==","signatures":[{"sig":"MEQCIEcurvA4deL/wUgEwDsvlJx345KpMDYjxF4dAVPO6iN2AiAc4APH4KarnB7+F9BfTCFKdVl//au2BZfuDHdK6f7zCQ==","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":111554,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.4\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJe8U7HCRA9TVsSAnZWagAAZUgP/1NBxlFZYtJFoxW/MPD7\nDvPEAiK+DySVSl33YRfEHQDcu5aAwjygk+Nbg9LzgWT4jh7aJ/5Afwlu9VCp\nBeGUuE7CTccNUFnweAANVuxl3Pn1S8uvv+89Mse8zN+r4WP1+XOk/Z5NHE6p\nuV9gmXpZGeC7lQC8dBIoQbEOrC/nsu556lQhcT5bn271abOqL7zjmdF2J8AN\n3TuqkkZ7DyvyQRwVdWTYqBSl3GXqSMk+7CmiGe5Mgef19zx0xtJWO5UXt7u1\npCMmEtpUBaNc7Q8fRHdpE/Pkjw81u/H8WUb9NBGXoOMWlRqvR5qRUTNFj066\nB3X8HADMvKd4AJO3cF4ft+kXL2SBOxWwTj732ck7Kw9USObrgnmav5CSEFdx\nkoeOfUThMnFa4RUJAR/75XtygjzX7lAQLfnHE6igaVgqI2Tj2uwmwJIMlZ47\nPK2pk5AnsxDyzB8ZbX9TsVEJqFoxRGojkwyPhzx0lIFwgHyLB5A3PJ3aROYl\nqoZYSZx6rb8seGIJujILb3QqCFFzDZ/KeW7q3Zn0XqtuqtiYTP6iU3xfoi1j\nm7ED3g4s1xMQTfUEbLpaq0lJGns+6K1Tjvq3u2n83KP/MD0TeAS5EZ9orfik\nqUf+3x+YA2EpkDkM/tvETTl9oDQa2lqZ9GrKGMx40pEWSTkMtOMU72gT5KWx\n4NGA\r\n=w7Kl\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/mergeConflictMain","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","browser":"./dist/mergeConflictMain","engines":{"vscode":"^1.5.0"},"scripts":{"watch":"gulp watch-extension:merge-conflict","compile":"gulp compile-extension:merge-conflict"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","dependencies":{"vscode-nls":"^4.0.0"},"_hasShrinkwrap":false,"readmeFilename":"README.md","devDependencies":{"@types/node":"^12.11.7"},"activationEvents":["*"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.593ee445cf_1592872647113_0.9514140061887901","host":"s3://npm-registry-packages"}},"0.3.0-next.c17ed9ffec":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.c17ed9ffec","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.c17ed9ffec","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"40388aee6d6a887977c69ce6bb3ff81bbda06660","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.c17ed9ffec.tgz","fileCount":13,"integrity":"sha512-TYNjVsfpzPthvLL6ISLeEwmMgKTkGL3H+JawlvSWCt2PEJN7qMEtYiuh7lM3ySAy4z6OMboCQkZJqiPkRelvGQ==","signatures":[{"sig":"MEUCIEqy+TGJvjyjLLCGtaWcDsfX/NSY8os98G45g5X7As4UAiEA6e+5aOODkiS+XliFGy1V9+u5I7LbyRaOLQpFIQrBeS0=","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":111554,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.4\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJe8qCdCRA9TVsSAnZWagAAGr4P/Ar4TLaH9nx49Znzy+DK\n6D4spFMFgiEaKr7ttOO90LWEmSCbLD9N6Tg1wNqMANZXbg9gOUmwgoZ9k36g\nOi/VQs7NmwcYPR/afk2bAh/u4Z/+YGcKCz/YJh9CqtlACjdywd0c3K6psOyB\n1ggBabee/rWCtr97MxvUmvpV6qIPRiC7rF0ZYVrz9WqesrW8vUPNtRzhMpnN\nehc3zEXftXU4y70H3olS6NcNTI+yvGjInT5ul/rG77AfSB8ex57fRpsTM2UY\na8Lhnw8qOGCBAVLxGRnRNL7/Gj0m7bYjV826Z+O/8LPC/6ryXErdfoEy6/rn\njROjUw9SwH7TFt2S8BMDRWuaxl5Y98xUqFQmUnYB16NwhHjWR/INFRKRaxR3\nh2nr2imofRJMZJNHDm0TRDePm4STOpzUIj3/LldXMJXgOMEkUZ/RpnFFQD7x\nnPLXqOOFSQoj+TSPsUJ5G77GRd10SANb/aVhdm1mEW/C5hzlaP8BN8aPQmkI\nl6AmlOohFzPKS5xD1VIXB8VP4Jag+Wiv9KY7b1jW91qtXPxtSP6tx4QG4B31\n1myeVUEFXjkL8JPpwZCq3fb2ieifB8fOEyigB7fPJ6Ram7NVgGywFxKctnzD\nQx5OrnBehkxNIVBCH4Bs257O4x1ONV+McIzms/vBfXBk3F0GWd71BjmZUcIn\n/rkv\r\n=Ph/Y\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/mergeConflictMain","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","browser":"./dist/mergeConflictMain","engines":{"vscode":"^1.5.0"},"scripts":{"watch":"gulp watch-extension:merge-conflict","compile":"gulp compile-extension:merge-conflict"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","dependencies":{"vscode-nls":"^4.0.0"},"_hasShrinkwrap":false,"readmeFilename":"README.md","devDependencies":{"@types/node":"^12.11.7"},"activationEvents":["*"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.c17ed9ffec_1592959132648_0.5494821283576494","host":"s3://npm-registry-packages"}},"0.3.0-next.c7ea388c7d":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.c7ea388c7d","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.c7ea388c7d","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"3048f233a6a6fba68d055ad91214b7119563fe0e","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.c7ea388c7d.tgz","fileCount":13,"integrity":"sha512-r9yM6A2TCBE1Xinrk5W4lmCAEX4Qqum2ePxOwrWNUoZwGPwWM0zmSVPTeFtsvNU99kjfEVmC0x0HNY5juJAIfg==","signatures":[{"sig":"MEYCIQCaPu5XcVCXupzVWfCxqySeWPPZz60r+piOFrrEEtWI0QIhAOApt2x8Q0pCrZHJKpmID4SatyxFmCwxFuy5xE1XwJWM","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":111554,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.4\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJe8/EkCRA9TVsSAnZWagAArRsP/0HLtzKaDHrs+0MqFHlv\nt59iOU/olcZPRt3TflMtNvu5rjqZADinEbXb6rS7qfw2/jUMEDwgdAFt1NNn\nR5lwhtpmWLh2W6CDyOkEYhFJ8xxsrdiNR1p5w2ahCnYxMl5paWJBk4NHe0eK\nqwc3YFFsMX5u5gVkZb6D0FcWi0nCWj8qLwIV0zUcWPrXMg+5zJ+QY40lZ4+I\ngCHHbpjhh8cYLaVW1PscF43IqHmvC6QpY65b/XT8ckCxPZiRCwDgdLyD8u3+\nD9ZRBNB4vgrys+hWZL/qTh0gM8hrDha8FRE0gz1jKVNYWK8dxtfCgWDblL/M\n+WbkwvzPFGifoDSNZ53PozXEj7ej84/VOH8aa1TWW0bgGtEkgR71iVs4Z/IV\neExtpSLwqsOAobu5f2/GFch/xStfrE5a9getpCDvDwrqx+LIzjs1BX8uLWnQ\n5cPMFHzesx1/i6HodPZLFdMkWMgnnviF/7Y57yhduCkTaPPcylt6fJCNCovY\nFsqzOGvunAl6E5cJ50jptAQEsRHuRozxwZdvKllIaUiFlrSPXABPWWRBWiyp\ncM+QZHtI+wFp1/BKCzs5hSG0/htg19lb7be1QKONr4I0bijepPfszBUTt2+c\nPnOosJ1ZPPVl+mUBtZf98eJzV8betVunb5YyT+BzQBBLM4g0u3ugFtZWd5pT\nBVep\r\n=i8K9\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/mergeConflictMain","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","browser":"./dist/mergeConflictMain","engines":{"vscode":"^1.5.0"},"scripts":{"watch":"gulp watch-extension:merge-conflict","compile":"gulp compile-extension:merge-conflict"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","dependencies":{"vscode-nls":"^4.0.0"},"_hasShrinkwrap":false,"readmeFilename":"README.md","devDependencies":{"@types/node":"^12.11.7"},"activationEvents":["*"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.c7ea388c7d_1593045284456_0.9249364200358086","host":"s3://npm-registry-packages"}},"0.3.0-next.3158fc0f76":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.3158fc0f76","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.3158fc0f76","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"5bdcf9768338a2c256f1d2275e0e895ebb061084","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.3158fc0f76.tgz","fileCount":13,"integrity":"sha512-Cyad662n85oRhDeg0EYgfFdk3DAuxMc3XHkXg2OV9Refpp6pw3wmSXqV9zT+mmf4fp7RY6TjnhFfeV0FYCaRkQ==","signatures":[{"sig":"MEUCIG77gFte2wxGKfZj87tLDrjoTyAGRyf9NDmnlGRaqxj0AiEA4rUOYYg+eBl6GFafFMacCEwx/VxPJaIc65H4EEpyU+8=","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":111286,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.4\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJe9UM3CRA9TVsSAnZWagAAcCIQAIoSMpfK4dsnhBPZQPDn\nrmfULARlkPK618d+ePJmMeFzKQ2aS8e/DjdZxcVoyfdsG5xLGXRoRjaVWtME\nlf2l4QNwH1yBrIRAEffj1rloE8HBzkx5TCYgMExrAu4q3KYVXHRGdZbMVFSG\nO2XU3yNyCKvTxFs+H9wkFLMGXTALpcRAYotVe0SiEfdwfeAGdqoKNOGoGoms\nL2zd7wH5GI/5/CCUJ9br97tbEF7d9yBSDlHl17XWN6vuELUQg3jDOragx9dD\nJmBGm+wiYWancBr9MlZiBh1Ms4C7Y1uAhPAMuoBhN6oxyw7nhxnPI8/Gwj3K\nv/Pd1JJCkl9WjNJWPfJCY/6nsmFavdAErTSlUQDp88kn8tEWcZA8pFQLV/sH\n6AzO2sT4iqbBxlz0drYzBQl1JPxgBROKmEEC3reXrG6n/XSI0v0ux3s7ykri\nK4JivV0mZA5PisbUNzSYPX2N3lgQ5DWQf/xjODUKYZZZSEx+r0O1Gu2bkD1i\nB1cwfqMNJ9P8qcv/aeoOcRLerRGGh+Jm23+Mhu5FoxAk58wHqw8MHGUgSPzE\nKRZR66lIgWdQznyN60xGabL4BfspXbN6aqghUxnjpXd/Hxg/B4C9PP3U61J0\nwA5+sJBp+TsyL9pL8kK1Q5OSsQO8CdlubJULZMVkxf/bT3TDgzySIK8DpKVO\nTuGr\r\n=7K+I\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/mergeConflictMain","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","browser":"./dist/mergeConflictBrowserMain","engines":{"vscode":"^1.5.0"},"scripts":{"watch":"gulp watch-extension:merge-conflict","compile":"gulp compile-extension:merge-conflict"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","dependencies":{"vscode-nls":"^4.0.0"},"_hasShrinkwrap":false,"readmeFilename":"README.md","devDependencies":{"@types/node":"^12.11.7"},"activationEvents":["*"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.3158fc0f76_1593131830982_0.5099252418347766","host":"s3://npm-registry-packages"}},"0.3.0-next.04c36be045":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.04c36be045","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.04c36be045","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"94e24c346552861693f50fff7bf56d776aad14dc","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.04c36be045.tgz","fileCount":13,"integrity":"sha512-fwgobRlQ7JN/IFr4KSE06x/Le4tQVpxbcVqD555IjxFvnm7QIr3HBpow+QlauXz3KBh3phfXn3TZW3TRs/hEjA==","signatures":[{"sig":"MEQCIFuAVHo8CPj/hnAVcrKJqssjwUH8YBtBSw/vp/hp9CK5AiA6RMLq1RT/VIZsevkGeDPWZaxKoJfuQkqJgDVhFHqVCA==","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":107155,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.4\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJe9pT1CRA9TVsSAnZWagAAsS4QAJqs6Qcj+dd+5gPfiy6c\nMPc1V6pKhwR6Fdwe1m7YyD7YVcSulWo+mJLaEKfGVxTEywQyH3kcTLpicwMo\nWbciy/Pc/z0GZd0Pj2N+QagpsAayc/4/y9KZ3YuwPWZJJSpinCefKJzSaoGk\nakCghPfIV3txcUdGyio9vDs22T8C8br+Z30joK0vvG18sBeYs+Fruj7sF4B9\nPqLtxqhqLmC+DyC46XNrrQl7DJmD2NsyQmwU6/VNu6OcJLePwIYMBRoHGIRH\n2m5BpMB9qpZqDNPd+Ht5YN9REK5Mc1C37EuIFcHtccZHSzOv5YRfiYcPMYzx\nUG83oAdBgvgyKtALQqKKVNszFlhVZsX82/OywX1pOyBUrtCpcubXV95VUod4\nVgWhxs2ykgiidYaRkWqjrw6liLFa0qIL6DDqeyZZoQHIZNQr0Q4xMc4oR64B\nLhSCb5lyH2SiGdXzREL6RpCptFyDmJxrWgfBbwcPQw2SonSL3De+aEQrjKig\nT3s5wvOkLezeglJK8uL20Cg7AGwrvo3cgXECjDOgMstTz8Lh9bIldTZsDEXh\n+xh8niSK16Y72AqJwufjyaJrMu0GUwtpZVtvWRqhPMqNNTtuX6Q7H+4+KGLn\ndZB0VT3ONQnQysStzYNK1ey4w5dGp6NVXn3WmFuXojZLXjunYRVfD772sNkV\nmsdL\r\n=I1nz\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/mergeConflictMain","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","browser":"./dist/browser/mergeConflictMain","engines":{"vscode":"^1.5.0"},"scripts":{"watch":"gulp watch-extension:merge-conflict","compile":"gulp compile-extension:merge-conflict"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","dependencies":{"vscode-nls":"^4.0.0"},"_hasShrinkwrap":false,"readmeFilename":"README.md","devDependencies":{"@types/node":"^12.11.7"},"activationEvents":["*"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.04c36be045_1593218292670_0.9857737730207923","host":"s3://npm-registry-packages"}},"0.3.0-next.7923112cdd":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.7923112cdd","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.7923112cdd","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"9403a01b8e772c648bb5fd6152cf6858e9e8e181","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.7923112cdd.tgz","fileCount":13,"integrity":"sha512-znzEY3z6hLyA98xd4gXP9EgJqMWQh91+CdUWkxwrRAc7bZ2rpEn/nuVf7lM53rE+CYpfJKdju7bQQVFtIooclQ==","signatures":[{"sig":"MEQCIBT8khf+QlCN5KeipYBozzfKWzoH4lO8jh8L6n/n/75UAiBrC4fpkKUFi3p4RjZ9oPogTUab+c9WK3mqF6cmqt8BZQ==","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":107155,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.4\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJe+TeBCRA9TVsSAnZWagAAYBUP/2II5lh5v5SnrTOrwbVR\n0Sot1Du7PJr3BJFLVDq8Uqp/5plWwowoUDJxAHBdElP+8Y+wMoTUU6tCKhLY\n4ma33ublewzr0ro+XfhqLdfvnfxMHOPm3BXlrl4+bpAuiXlvLgP0qfuo840G\njIRsB1ed+HOQ0yptrHGc6PwHuu56pUUJWCMwqQd0BE2BZc72GabMj0kM3jaa\n/2IJ0QImLIhRRkcMzj50qEEQLmAW0yhOrigq3JBSCh94uyH+n7A1HPKHC4wU\nIpkyGCDSwSwZv3hBLKw+hkuDXB9UbLCsX5pW9PgEnYa20pX14EQPFrSG7FA7\ngoEJqaTHqAHBV/t0Q9iJ5y86Cxpg7yAl/2IwHm2FkBJvW0mptNx1KveHdltl\nTmpj0fPuSFwFm8cZ+jeAanSFKMrJAgJPX5s+ChUkvPnEsd3SPNTPsWfZ/F8R\nl7s0iqIfSEfyA4i1UfgalJevYzHxiiOPFLc4aVYCr+VoHKWr6cLXvQS2Rfu3\n4t9/wAx8KwOrWVB2ohemKN35urkiUM0ReCqNrMQD891fJ3vlfmSoD+9LN0pf\nPx+InEWXNytGPpSSSQKCSbaswebycaofi5yIBg+L1A9vP2L5v7KFW4GZGNxA\nVZ8XmlCJxiD10hxtVETj5g1Yim4CGNROaM6n5IkhzcwYSTyiBEdnkWxfU4yb\n0TTw\r\n=mLl+\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/mergeConflictMain","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","browser":"./dist/browser/mergeConflictMain","engines":{"vscode":"^1.5.0"},"scripts":{"watch":"gulp watch-extension:merge-conflict","compile":"gulp compile-extension:merge-conflict"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","dependencies":{"vscode-nls":"^4.0.0"},"_hasShrinkwrap":false,"readmeFilename":"README.md","devDependencies":{"@types/node":"^12.11.7"},"activationEvents":["*"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.7923112cdd_1593390976599_0.694843054345776","host":"s3://npm-registry-packages"}},"0.3.0-next.b26cde750e":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.b26cde750e","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.b26cde750e","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"8659585a65adb5836964ccdee0061ae6c4c142ce","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.b26cde750e.tgz","fileCount":13,"integrity":"sha512-C/uaOnBXTKcrD/vPK6RlD8rfXUBaAFAq7QVUIU9vpeosA9wy7j0TaluztcXHfZDJ8dV8DDOfL1/+aBnOh0Z5gQ==","signatures":[{"sig":"MEUCIQCV4ImY2B74lui4HrSg4t7ckbaHyrZ6VRak2PT5YzIZPwIgUtdqfRxwIeH1hg/WKp8IB0Yl+070Ti6UIQVw0+Caarw=","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":107155,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.4\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJe+okDCRA9TVsSAnZWagAAWo4P/1fISloBUR/zCh0Rjqpw\nSVOzYbk4trPGcbL/Sq98i/W37W6qqeTm5WKfRLeDKepA/DbLamCTnIm53KYF\n7KV6iDfPcZPWZ86PKmcLpf4YjS1WfUu7hIHf8Qaf8wnhxjptc4Ws/zpkWDeq\nmSb7Wn7P/yUsrIU0ASzQPMUr2xUfbgKCHqDLB6zH7iqkbbfhWMS6p/QtuMdR\niNOiE4uUk4V4fDaJRxtxxdSPbAgAAi2G8twuM5y563jrlbPzTnXKNVGKJ/xU\nAHK6Me2wbduVbM3dmnpD/PgmgKBj9Gb2jN0KBW+RGvQLgkXFf2luTImSLBdB\nZYKDfUx3o2D7tQBnByQLnx3wxfBTCWm9qtSB/mljBqxDf8EyHCsgAl4GGEwt\nnI9ZxoxToDUHovWjqX/64I1nE9Ol+22OJi7FpjHewd7Xba5E8kJVvWBsIXo+\nQY/pcNrLs5psVh6F6/p3FvBTNAmCWr8X+X9lbxaKrhh5lWQyQLHMmRRuH+Fd\n7RBPEYXfxJ53R/y/hylOTK/KuzrDWXgCLA9Vv/VWlDhoMenKf1LUIYSBnxdn\nfoLn1VwArow2ZTz1d+SvxWR8cYjnjIMrvtDBUA6HEY5MmX8yPelezGl4Q5YI\nDCr9Yx3yzHXeBFJAmQigCj6a9QPDRSrKKMYLPPDEzlz8alcW996IL3NP0HTk\nQr+L\r\n=vybm\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/mergeConflictMain","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","browser":"./dist/browser/mergeConflictMain","engines":{"vscode":"^1.5.0"},"scripts":{"watch":"gulp watch-extension:merge-conflict","compile":"gulp compile-extension:merge-conflict"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","dependencies":{"vscode-nls":"^4.0.0"},"_hasShrinkwrap":false,"readmeFilename":"README.md","devDependencies":{"@types/node":"^12.11.7"},"activationEvents":["*"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.b26cde750e_1593477378691_0.9229652687666792","host":"s3://npm-registry-packages"}},"0.3.0-next.ef903c70c0":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.ef903c70c0","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.ef903c70c0","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"d5270637ff07075f893128a8773738b7cfa832e5","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.ef903c70c0.tgz","fileCount":13,"integrity":"sha512-mFKgQFoP/UfggO2JfIqjNuFNlv61CbJDPyA6jvABSPFef6SvMiQhIC/v3HKPd6WI55CHmKQcOTQJLwaGrB99pw==","signatures":[{"sig":"MEQCIF6UKkKYK72OtNTo5VQ6tCNu44Y1wOLwmbMnlo4rwEzyAiBcrnh6WXwezmWEntjM3XyJJqRHjHFLQaO420WKqL+o8A==","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":107155,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.4\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJe+9v5CRA9TVsSAnZWagAAwz0QAI6HYYqcEZRhGdUAq9oZ\nEj0iN/mKajLGMP9yuEzAJCGtY/ZxvTANPd1h3VJ0hj3onZa7LDT1nElOvowh\nLEjFLG/+oftvHEaD8hKLtw7vfm3LQM3gmXQ3Lk0WP1WJND5MEm6kEVfUTT7n\nw9LEekeU5q+6XQ+T3Xf6Zuz3STthyB5iMdggTeeY66oUGoZ6OpVPQNYFeFMZ\nzBxlGfw9rA6gEVbxSoumsbBj6spNqnqzgXt/SLiWeEZC88KFWsLn1rpkblgf\njEYxqE3bOAJuIfTx+OA7s+Y8CjK24dewYpgY/FjjrAhhO0CKibfXGvdzGolF\nY8wqZy65FbteMT4EvNtxrAdALOu6uBJ1T6lDGkCuDxcssod9ILftkV6mCkFF\njLa6PmFq6Xu/yRq2Ih02ZtEAn6uzBl4lPqVfAPhVPHEZyddlS+J8sCngCS8F\n/4d9VIxVlt/41dMTJaZ1diLo9OV17kcpnPEBjuNMOtm4uzMXcjmJp6Z6w1TO\nlXiVafkxMHNxnqKXGQAs81vFUC2rZmysWwYIz+fnfxWUYbQ8I8+EF7tdktf3\nnk78BX0KVst9pJqtVUE2sO3V4JpDutA7tZzmf0ZcfWDvqxYD1wz0hqEmB4gO\nLU4ZvgJNTHCEmL5HRflPXYeY64ZHqvE9lNEcFKnsLG+jUIfBsAEBUUJJvbZX\nv0fo\r\n=Ab+R\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/mergeConflictMain","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","browser":"./dist/browser/mergeConflictMain","engines":{"vscode":"^1.5.0"},"scripts":{"watch":"gulp watch-extension:merge-conflict","compile":"gulp compile-extension:merge-conflict"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","dependencies":{"vscode-nls":"^4.0.0"},"_hasShrinkwrap":false,"readmeFilename":"README.md","devDependencies":{"@types/node":"^12.11.7"},"activationEvents":["*"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.ef903c70c0_1593564153121_0.9660933968654624","host":"s3://npm-registry-packages"}},"0.3.0-next.5dc7025c1e":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.5dc7025c1e","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.5dc7025c1e","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"df8979ee29823390aa02ebfd84d3c6d7c957e5ff","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.5dc7025c1e.tgz","fileCount":13,"integrity":"sha512-ehQ61BHLOGp1D7D29VP9h/SgqqaUvI4kha/hqxhuefeF2ALxY+MwANtq0hbMDxrwEWP8EnLnJfjE1+mC1XCPCw==","signatures":[{"sig":"MEYCIQDO/pwUnxWhuAcCzJ6Gapfv1KOr1v84cNqtGvmAKWs++AIhANgo5zPnjqKU2q/OE+1Nbm4D7uCUA1WcESMiNUhXJZA6","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":107155,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.4\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJe/SysCRA9TVsSAnZWagAAGA4QAI92SLQY0DM42tJgAs/P\nH+0UVQaUw9CQsmWuQ0iMjKchd0xXbnC1CzNHH9+vL/MkINVybdzxjTx8SU5w\ns1Jhs2MwoVitk6WuOJZu2LvJYTzWtCN/G7j8g9RDMplX0pqtCOoV+3HBSHg8\nn60dyWTXbVc66t2BecDGUH3AYWzTl6SoluBN7EegkPUsPZ+lKgxZ+k4qlEjc\nIQfpY8cxL6UoD2i9+51NdNgsqJHKpP0Jy5FA+yS6s0sl/+37ocVmcRekzXvF\nPEnEDPxlNRwwnrMZ6YgUOQr4MRE818oYz/SBVaplCs432HRLMmnXobdbem3L\nrifKrQfIC/XqLNlkQCQG1gjPC8WpTdQkJkoTWmxijLIVda9WseidU6JZPjBn\ngwTSNnssEWhhBHgAfoAhgE37Yj1n5pJNyfCs+ekY1tPjEvcBCJ5UBz9KvluB\nYHpAdbBgOcVcvFEG5Z9LCrTjZ/VZ8BMZyUnQonGmx/E5VJXMvjKvlm+f9vgD\nYpuppzAVHYldDHescsqdpGf9vOe0TSD73WoLjnHS5+PhAlas+KlVrboCL7qj\nCSGj2sQibHV6OX+JFqJKWzG5nnTLuvCLI6e1mOkTwvU9TkZYkgeSo8dQcG8w\n3bncXWVbZfbQ6tQXYjyeQ4CGz99pUF6chziGB6gQtHlHNlLfKWkK1GWhFfLa\n8YfM\r\n=Xxdy\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/mergeConflictMain","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","browser":"./dist/browser/mergeConflictMain","engines":{"vscode":"^1.5.0"},"scripts":{"watch":"gulp watch-extension:merge-conflict","compile":"gulp compile-extension:merge-conflict"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","dependencies":{"vscode-nls":"^4.0.0"},"_hasShrinkwrap":false,"readmeFilename":"README.md","devDependencies":{"@types/node":"^12.11.7"},"activationEvents":["*"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.5dc7025c1e_1593650347933_0.4280439281402455","host":"s3://npm-registry-packages"}},"0.3.0-next.e38c2d293d":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.e38c2d293d","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.e38c2d293d","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"21e78b3ea405a9d0043400ba1953322d0a19e5f4","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.e38c2d293d.tgz","fileCount":13,"integrity":"sha512-hMsxTlf8b0769Ck3koYpYxHmFgJ7outuOT7fuhYZDTxTDEetT3I1gKvS3x99P+6D/LnCaSGceBYtXtAu7Th4tg==","signatures":[{"sig":"MEQCIBN9u8CL5ZWf1hZFWGc0S257TVFcU29PWNSm+D5oAeuSAiAEC2HuVRk9BYWr7lvaludu7YtUQTg0274C7DkZbP8XyQ==","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":107155,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.4\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJe/n78CRA9TVsSAnZWagAApjQQAIf2WhXesFLLESw16mwc\nuGZKIfi+MY1Lgu9B3ZzgK43W+kpNQJL9Df5flB5nI9GhXA/BnS7pK855+StJ\npG+of/fABae90MEf4xr85xSfofPy7VKqN7Pcza1b1iEg32x1tl8NKygI/GTH\nQRAnI+pc9ejPa9XMG9bdF79XPoy6fRKD3kgGHpe5w9fDaPgAu8F9HuFPsPdD\nwNqdQmrdBx1Wi5M00xkPT7BELFDJ8jLIlT1PrEIMh0Gd5wKRd3KduNxLNjJY\n+YgpmuFJZK6A1MO0bk9C3I46NGTkfoSO7eH69lZm5RAKD1efccJ6AVnUpgR0\nb1fTG/RdbZ4LGGvZpR45O3fR1Sul3PGfMk5DsqtfHG5zADWYqbsgv8/ZjKgl\nZAxeTkRuhiF+2uJaX7N6EsTSBlmN0YjOjpaEnZmX3iEOoe8BmcGQg1kBRuvH\nwOGyDX1OsGC0zjBlo9rfcEgRbZEaMFGWezXXD5567C2lhm8uBcFiEIImAfuu\ntZGXnrUO3SygvQb5edpGjuvmtFGbXIfM82MGOQJ8KyAUTyU4igk8sEQlAnYi\neum6wj2yqzKSFW2Spc/8xIQ4VbOUoOqLJQf4eek6Emm4Go2cO4nB5kVNFYlg\n12kEILJvj5pSXjbp/+tpmRxttYsSpjkhQwQBDML3gqGjCSqoOcbK4M/tE/lV\n43on\r\n=8ohr\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/mergeConflictMain","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","browser":"./dist/browser/mergeConflictMain","engines":{"vscode":"^1.5.0"},"scripts":{"watch":"gulp watch-extension:merge-conflict","compile":"gulp compile-extension:merge-conflict"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","dependencies":{"vscode-nls":"^4.0.0"},"_hasShrinkwrap":false,"readmeFilename":"README.md","devDependencies":{"@types/node":"^12.11.7"},"activationEvents":["*"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.e38c2d293d_1593736955956_0.20349959266107764","host":"s3://npm-registry-packages"}},"0.3.0-next.ad8c805aa6":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.ad8c805aa6","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.ad8c805aa6","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"f252d48a82d86e51500eb8fca1087ad9c278f203","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.ad8c805aa6.tgz","fileCount":13,"integrity":"sha512-jef/u5npNS8IDdTiMo2ovSOcdVC0RUT2GrRsP4DVE/jo0JJu3wzdVsemKlcCGFhNUwfUVr9MoMd+OJTv7/LtJA==","signatures":[{"sig":"MEUCIQDL5GERCl2d0QZojLr4L9hneJuCkuk5EXF3bI6Z03/diQIgX9rMlaAdtIKP1XJcfxBtDSN1dtwUkwvq0fBh6PI/7EI=","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":107155,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.4\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJe/9CWCRA9TVsSAnZWagAA6YUP/jkF5o6A3quFHWG3FlYQ\n4/lnj2spbNJ1gChp3ltEX0LSfi/lvHYX1M7NfLEsGfx1n1PcSco3V5UicCy+\nINMGgy75a2WBBWnaulafTKnCG5+mVyJknibQgu592camhj/6TnKTTK6O47B+\nB9viBWN2NI0h3ZT1S3HR4E5A7qAzMtzD8k+lCWGjQO5oVtaVXI74HR/OQhiI\nFX1pXEGthXwCMNcXV6gwF2GxpX37Q6zrXEsFF3MbVPxTQrsOoR669gSkN/Zz\n5Atg3mwBtPDrAPzjfBjvVpIlJ3wAXvveIsi65ksrYyYfi1scjnXFwwfO2W/R\nzhWfg1RVM3r4Us6uWky9g1Ec9cjigStxZWI9krz+o+VfzJVbglhzovCISnHE\nPU6Capqov9KC6WxAhx/icU7ess1oIjYhlCgO8Ua+y0YFCEGWquSf7vdWu1Oc\nqmHgLzLXBgr0u90PsPQhwCJuOZ349PBJuqa7NimnybeWkCCNEHA35I2mFUGr\nlwRSJGmfa3lxTGztVk3KepOvlHbdN+lDuEmKnrGlbDFVhrR88IGC661tVkqI\n+ZYJATmgcN7w7vWTtmS0aY1mnNnNE4mdI37n11BX8DV0Sbud4/a5GDXP63fN\nLpwZZ0fULephovWA5Ffmpj+1rjA+aNN0Z3CgYCEDtIlSTrfBmLmrNjZe/6V8\nYu9V\r\n=btf7\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/mergeConflictMain","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","browser":"./dist/browser/mergeConflictMain","engines":{"vscode":"^1.5.0"},"scripts":{"watch":"gulp watch-extension:merge-conflict","compile":"gulp compile-extension:merge-conflict"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","dependencies":{"vscode-nls":"^4.0.0"},"_hasShrinkwrap":false,"readmeFilename":"README.md","devDependencies":{"@types/node":"^12.11.7"},"activationEvents":["*"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.ad8c805aa6_1593823382073_0.3258069431072186","host":"s3://npm-registry-packages"}},"0.3.0-next.4e4941b802":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.4e4941b802","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.4e4941b802","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"b7dc30de2034a0f480da2cba227092ba14e9f4ee","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.4e4941b802.tgz","fileCount":13,"integrity":"sha512-/6T+3PnCj+9HmKrRlPRb0cksmASJFfvqyd6GSL8FweQ/7GkgLz8VhYsO4NCObXUmnYx8WoKqn5cViCmlCX+N3A==","signatures":[{"sig":"MEUCIQDN2sk+k0sE0AGEWAVbUYNg8vtqGKu9AFA7v3DrEyl+DAIgSqGbZjC6wMkk2E5XmR4B9zGQmeMubvzwX9CQAtfBolg=","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":107155,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.4\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJfASImCRA9TVsSAnZWagAATv0P+QAlxkobqxTLbpXBuNoU\nEaDaL7MFiTyB7rkq8AnFtjsgNB/OUdW6F7keFCN6dVDYbmzHSrFuip/hSCSu\nKlCyhpzZuMt0462snj6GgCp4CbvflntGZpJt3VG54Hk6l+SH7gMtheLNi0RJ\n5mrKzfyIjkwpXHc90MqFYfnUHz/a5srbCcgkKb0lOtbwxJu9Ko0PmI9Ond9q\nwU7ta59otZBu5sh2zcNMRh8pFmkZmRPDORtRUwwTHo1pYD08AO49z8pxrgR+\nphUAjDz70G+W7pmfZ5hHaPBVeMQdiMuRAl7BS1uIGpnXpuYGnkyctgHnI9nz\nzw7wSGB4cBFJBia7d2RNHgq4DvdjpsHn+wpSGS2k0HTdZmMXQpIQDJlFXdwa\nHD/E54Mx1YpOKMZ/9tFOr65grdRLqh3vH2kIDSEvuyXcJRhzGH5ZTxg4LKef\nJoCj9LqkM0sk0rSewBrLW6zgu6xkUlYphtwL2ZanyulIi6il3GfW6mON/xds\nhlwnu0eS+UyRxg4JNYudKDtgC+PATxd8UOTeMizJdGbbH1F7Un0BaKrHjoLs\nXqKKnVzyJmoKbaXsfOKmAJRnJx1J6qnnXEMqc6pQ6tWoVun73Gnf6VzkyMYU\niDW0W+7wsCQUNSCPHOHAK7NspYAiSSavpU6Lk++UP+jxo9K2nIqJfE35g4eu\nyjuD\r\n=ghcC\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/mergeConflictMain","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","browser":"./dist/browser/mergeConflictMain","engines":{"vscode":"^1.5.0"},"scripts":{"watch":"gulp watch-extension:merge-conflict","compile":"gulp compile-extension:merge-conflict"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","dependencies":{"vscode-nls":"^4.0.0"},"_hasShrinkwrap":false,"readmeFilename":"README.md","devDependencies":{"@types/node":"^12.11.7"},"activationEvents":["*"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.4e4941b802_1593909798138_0.8589742380884591","host":"s3://npm-registry-packages"}},"0.3.0-next.c50be4449c":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.c50be4449c","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.c50be4449c","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"f41478722d7f5ff35e1ec245f41f57a724ce6e36","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.c50be4449c.tgz","fileCount":13,"integrity":"sha512-oIwEq3vFIhGBQoWHYT61ycAAoZH1CuAc9qRhSmXIcACYQQ4GZ4DPhQ1rvHcpIY1ltH2UrMxpL5wjFLCtoW8k4g==","signatures":[{"sig":"MEUCIFHD7VVV9tGVTgD2xighYWrxtGx777MHPZ/9tZIjLhnSAiEA8Diw+HOIc33LfLPvXJGGpQVnb7LfpVVRqDX8QtOJCZk=","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":107155,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.4\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJfA8UHCRA9TVsSAnZWagAAxlMQAIb2rvXqFmiy/LD54p5Q\npentjxKXz13hGGQ3O74L3eXdt6oa5othxmpGsdJOKvTbLXTsKjAIQE+EAZo3\nsgFw7nJxA9JfytQ8v5ViZfnxyyLrhdN3szTttaNlmhcreOgRenxxCD2susul\nKb45AG0coZ7LpDKdgth3uonUXIzaI8MaJ6o9dn+fzhdzX7LCD6dViB9ITjFz\n//cBRPRGz/pkeR80CNrqjUw3vTIXQK++0gQI6kcuMDmu1G0yDm9Ao3X+DNY8\nXKSToO4rf2hEFM224fMjYVfmPatrHRxGLitnXkQ4nVqu1TRvavS/h5o1dCiV\n+ySKtPgEH4U7khYIOUljHJ3PPhEH4Qs3WAYEMiAHlQ3TAbwdu6DLstkyEnRQ\nXqVc96Kd6TDQxnVLXP4ucdEc0yc951jIeys/roEgij+XEJ7/1o/Kdn1ncBZF\njLUpRNdct84Qg8SQRmia/fEqCbuWmSr2gh0KAtdAmpR75YpHrhGInj3hhDKY\nNpSzjECfDRHScglO24PdCx7blFyNHXQC/jVkr5roLknJEO/U3SK2MN0lfMCs\nxs/epZ2CfsHdaSS05x8EdU6uY9/I8EzVd8oPDvI06ZgFURdqAaLlCG8HlT9T\nEeapFOXE81YYvQDzcTQTAM5iSkhX0AyTJ/32K/xPL9buBvV342MIP0gTDnbA\noMRQ\r\n=dcK8\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/mergeConflictMain","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","browser":"./dist/browser/mergeConflictMain","engines":{"vscode":"^1.5.0"},"scripts":{"watch":"gulp watch-extension:merge-conflict","compile":"gulp compile-extension:merge-conflict"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","dependencies":{"vscode-nls":"^4.0.0"},"_hasShrinkwrap":false,"readmeFilename":"README.md","devDependencies":{"@types/node":"^12.11.7"},"activationEvents":["*"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.c50be4449c_1594082566763_0.7511823320829059","host":"s3://npm-registry-packages"}},"0.3.0-next.b9a0407103":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.b9a0407103","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.b9a0407103","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"d8a8c1dd9904c522da0d22b7bce712eec280ffcb","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.b9a0407103.tgz","fileCount":13,"integrity":"sha512-tcQXcF310nqbHTqJ9dYo9c+W2rXtDUagjSOoq77B9RV5aWuObNoY0Wf/BqoRIb+7Njr2BUeUi/G3KiMmuvM5pg==","signatures":[{"sig":"MEUCIESdnViSVgsJxPGyr+xD/JVoW9giaevV7RKoMe84zye/AiEAjcgEbPHC99RZ4K3zgDQaWr92nfmXHGtfYiOFhsJ7Nvo=","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":107155,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.4\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJfBRbcCRA9TVsSAnZWagAAyfwP/1pGUSc9mrhDgqa2LrW7\nj1xaG8r/Lfv3ljopcjV0pMyVM9P6Cyzy82lECU0UcdTbCTbQ5NQn/MjtgF2i\nxHzpjD7zYMM3gxpy2kM86uz85P3yXE1mWUckoOEGd5AdR8g4Sm2Tie5wDrJk\nWWnz9gxqagkd4YSY/+XRyr5EOWul5qjtixDjDD4njLgGbuBzjbzKMcDzqw9g\nDzTKp24Qe/DNZW9rkrboXTPGnagggJ/2B4XaRAjGZETNQvQdKKU4vBPIdRyS\npWY2OLl+hk1w/YFddf7oPniMbmdQhAnOqBH1JtMTsaONXQ65Le0L38nvJjQW\nmKgyLWYolYFdG22FSC70DK/48APor2iVkhdmy3xFuBVpAjezFKyjKwhDXvtl\nX1xnhjg9sMvA01oyHe4LAKPb5V7X+LZrOIgMVXftIJJCGKXOEICXryTxg+ug\nqWsIbpbshzMospUhBgIuIdtwXBQNEobhxUhnVVTrlZoF8Vq+bJesdZhEiASG\n5r9C8FpWRBJ4qIZqtPVN9tt0RcvziGyIqv0tGMCITsMBS3aacvsdOB8hhCPr\nZvXlN1P4EPiKEor0V+7iDVsGD7eSBv/GLIclejYOmLMz/ooBMl2Efo0ZpAQp\nbyuAUhF4BZ8lHajWIGkSfXXTvut6A8vUYD2h8s9GAMKuTivLgpLF1XbPczCw\nUXAq\r\n=A8lx\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/mergeConflictMain","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","browser":"./dist/browser/mergeConflictMain","engines":{"vscode":"^1.5.0"},"scripts":{"watch":"gulp watch-extension:merge-conflict","compile":"gulp compile-extension:merge-conflict"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","dependencies":{"vscode-nls":"^4.0.0"},"_hasShrinkwrap":false,"readmeFilename":"README.md","devDependencies":{"@types/node":"^12.11.7"},"activationEvents":["*"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.b9a0407103_1594169052396_0.028853278550955652","host":"s3://npm-registry-packages"}},"0.3.0-next.f37faf6c84":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.f37faf6c84","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.f37faf6c84","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"834fed4db0b5986012bdf9de7d1479c76d0dae37","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.f37faf6c84.tgz","fileCount":13,"integrity":"sha512-JiUqm6OVN5okRqx8lVW+DEyk0YG4lnQkPJT/x6dyU/vN3ylA+pNHndq6zFh8c7GEoKgd8miljo3fjdFwHooHRQ==","signatures":[{"sig":"MEUCIQCpZFXBMnIpRBZp+80LYTKMJjrXFYl/EHEGBzcMqoabsgIgGfTQCy8rZXxbnNDy7KMAISr4GyGOXGqP4LBYkqIPWwg=","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":107155,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.4\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJfBmgJCRA9TVsSAnZWagAAuCYP/063OT4pP+DrVQxh+TLF\naT35AzVJEl0zN2Mw0kQLro6XJq9CS8DCQJu9rnMgSKbEwPn2xlGCAp5gRVUD\nC4FBzaJmc2J9jDjZse5ScXP0tpvUnMpOpb3EQLDoA8a5DsvbvOq2VeHL1xdW\nDL00KffestMbpOTMSSC4Hpr2TIhkwtLWN+aiUFbONLV9JLTXZEL56eMmrj0e\nVpx+PMOi8EpC/5vsj5hQOT1nTVqfRaqoVb8gARo2QR1HQyvuHiRJvmQ+354w\nWYzaQRl76ItgpXjYit7BcUzXfDaNyZdGcVWJ4pns/qIoqBYEyvtcAFf1VsdG\ntaouhbSAMz/vKd0L/s76gdiCjNUXGW/2yw3sKc7iqmnqFRHufkzu8fkxK4Qh\nnLi3M0zBRB7zpHmjDFgd/qRP+txVoczqSZTJSL9HK6HU4kdPUSFUZ7CpW4pC\nITFQ6xocKnKx9IQwNA6tw/Yfy3qjOaZT4QV7o0ckxROwU+Z1vzHQi32Tdzkz\ntNfIe2N7cy5tXmIT8Z0ioMO6XJ4vSAOC7Mq+DJ3tiK4cmWfoP7fpu96F5Zxj\nJTAoxaN8uOVaZvCkNzf6PRZVNKuEbjujyXkuFZ9dhsZmzAbUXGqTH1ej/1F8\njoAx/Wg93WgG8lh+AdDUiIrQTFFg93lBZj82wPSC7cS36OZieFUsv19FWGPR\nxc3S\r\n=YubK\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/mergeConflictMain","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","browser":"./dist/browser/mergeConflictMain","engines":{"vscode":"^1.5.0"},"scripts":{"watch":"gulp watch-extension:merge-conflict","compile":"gulp compile-extension:merge-conflict"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","dependencies":{"vscode-nls":"^4.0.0"},"_hasShrinkwrap":false,"readmeFilename":"README.md","devDependencies":{"@types/node":"^12.11.7"},"activationEvents":["*"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.f37faf6c84_1594255368449_0.3447374525911133","host":"s3://npm-registry-packages"}},"0.3.0-next.ae34596ac2":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.ae34596ac2","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.ae34596ac2","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"38649f7cc3c1905f919b74dab8b759b3ad1d4357","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.ae34596ac2.tgz","fileCount":13,"integrity":"sha512-brC2HYlRfWU9zMF+aDFPnlncDIWle7/kIcMumuc7kOFVPy5orGZTJt39RpgSLuyu/SbB0E2lOsIRf+dUdNVIxQ==","signatures":[{"sig":"MEUCIQDB4A1M95k8zA4A1LikRZMJFODCkFfggGoWjRrwoFk5BAIgMxt8miN5ZfxWfiNUX9b9/ifQZwCrAHc46i+P8UQxv2Q=","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":107155,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.4\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJfB7njCRA9TVsSAnZWagAA1MwP/RwzuJl1H3Is2pVz+VdA\n4jE3WdwkfzdrjmGpYgQ1l54qnKq6AaTQxIun+5eD+sKjzfLlgKx4No1NH+6y\nlcTZaFvepj2Krrid2mCkQr7Vsb03A3pHapdmGGYjCb4w9hIaqOolvfhNtmT+\nwycT12ABrnu+IRkucHX94fV8vwCs2+2FvqVJrUo+EHE74L/dDDqEpN9q0U5O\n+gT/UPxq1/dDrNRWJPTpihi+zvZwG07x0cR8+gSqLyf9d0ZA1NfkMijbDPwf\nETBSGfq+EiBBno6xNk6SVRQOLyMr+GFa9DaIfrk0SsqDP1EKHj7YB+tJAH/0\n1XxYyKPwalMF0Rr++gfqiKuhePhmvc4KDWzGfI+rPnu37beK2hZcK080UUUm\nYsSjSRE71i0ChWOqEu9NE1a9NzCJdnu4m3VoVteNORneG9RpkaAwfZ+uuLdj\nincu8phQiW9SQ9Fvl1lxl1QYhiLFAe02iVpotAQFhj0cnwj6pH1TWjwT8T0t\n+nwRRwrUWTEwxMQzjGYxqHmnRz7QAc+HFJtuQP1qbX/rEdtIMmFuheRmRs70\nkPJEibfXexkP5ZZ2kcHNwOCBF6HEUD+L1Pfp806TYOK8APIaHi2q639ky98n\nVfbf6knmbyjvr8kYlmnvQowl2NYgK+bEyVTUm4XH+/zlPo56TGA7CbUULvgZ\nXwgA\r\n=L+Qs\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/mergeConflictMain","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","browser":"./dist/browser/mergeConflictMain","engines":{"vscode":"^1.5.0"},"scripts":{"watch":"gulp watch-extension:merge-conflict","compile":"gulp compile-extension:merge-conflict"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","dependencies":{"vscode-nls":"^4.0.0"},"_hasShrinkwrap":false,"readmeFilename":"README.md","devDependencies":{"@types/node":"^12.11.7"},"activationEvents":["*"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.ae34596ac2_1594341858780_0.9217346983397332","host":"s3://npm-registry-packages"}},"0.3.0-next.1ca18ed83c":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.1ca18ed83c","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.1ca18ed83c","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"afd196bfbf98e4fef12278f0859a3dabf0514211","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.1ca18ed83c.tgz","fileCount":13,"integrity":"sha512-RdA7pedaMRrEM3Ca2tXOUnyOf3pT82dRz8cnEKH4KxdoiuYJJd8SvSFnYG/22rGt69vw3xsvz5zipJgAopNxgA==","signatures":[{"sig":"MEYCIQDWsSPQKeYlcLlOSZFdz7mr+ThAUQZLwmAR1eAHjgYhTQIhANwCN6NGM6ooVZe73V/9PyC28iXqdl8EOM2zy2hOwQC8","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":107155,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.4\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJfCQr0CRA9TVsSAnZWagAADXIP/0DX0LF2E7Op9ETByfKv\nrw0csYYDgzy2EsuzuSa2SQCfZGPE6R0Jha4+m/gbw+l3oJGqAb/IbSTMhaBU\nLgvu7g3v9AP98K5cp1rOX9rREdsZJYh9PXk0QoJriby/N1ZVm6XceUeZ9C+N\ngKf9GIOIZ70IpE1I1kYhOgeStR4f/1CxUH0itp+qjOBto0u8/qW/O8MIT3rT\nIyQH/2k9sM4Z/5mqho2ugn0MkvSQfd29ZPjy2nsA5FE4KCs/yS6tUP+F4kIV\nDXuF2Gbda0uoHVTLmNaJkU0vngzD9kPHqINpjQi8pvVlFwYgQgs1uO9HNotB\nvRDE6gaGUfWsybsfLEjjXbhopzBNlJQ4KMWntb7kUtK3D0ay89xE6Ke85s6e\n+wYX+5pB/VxyD99TQnEZTzOAY7E5e3aLzAEx8fzM9ctBdA1ckXzbtL4WbsIC\nXfW4gkgx9Gb6JpZ11+QNcDCis2QEtH5MFhGOcq5gs8hG2vUJVWon8ADMI17z\nQHIysr9j62d/thlApiAiGquvR9ESWmianfKIz7Xlw5CwEUiA45S0QxhOXFA0\nzZxvtoxEqsRruTpwgj+vjmsSuC829QnOWTQZayN8BqJ9AWo+f71pvGESVprX\nG9epkH4n4BhieV9DE1iXrh04MO0ak3Gqnm4aXSTAR7RY3Geqz1AXxrUciBSS\n8Xt1\r\n=hc2K\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/mergeConflictMain","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","browser":"./dist/browser/mergeConflictMain","engines":{"vscode":"^1.5.0"},"scripts":{"watch":"gulp watch-extension:merge-conflict","compile":"gulp compile-extension:merge-conflict"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","dependencies":{"vscode-nls":"^4.0.0"},"_hasShrinkwrap":false,"readmeFilename":"README.md","devDependencies":{"@types/node":"^12.11.7"},"activationEvents":["*"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.1ca18ed83c_1594428147582_0.9839521623272951","host":"s3://npm-registry-packages"}},"0.3.0-next.3d4ff091be":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.3d4ff091be","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.3d4ff091be","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"40a0f00a20621bf6823ea4013d08f7419294f1b0","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.3d4ff091be.tgz","fileCount":13,"integrity":"sha512-fLiElOE6SkrPCxugexUJmjqGOF+DyZxCxbTLS8hC/UpqWr31WnIRL1xlkyGd2gRBW1/2plAAUnUJ26shvMg79Q==","signatures":[{"sig":"MEUCIF8/OFQOg6MY2TpOncaBqo2GA56uZBwmLHAYCYXUGF2TAiEAqZt3iVJcmoXXKp7rj/FE9cOmh3WZW40eVH1LyMS6GbA=","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":107155,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.4\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJfClydCRA9TVsSAnZWagAAYywP/0Jonvb9kzTAu/0+1pK2\n8+fbQEhBTnCke+Biy0je7nHm1DVXLoXUEzDLBH8TKxMkF/OBBQa53YP//hWU\nsCCFHV3LxoTeJIIR53MLx8CAsew+uyxdxcXzIGoKQ8uoBKomhLZf0SBLvYRW\nfFQdOJrCX01tLbnABO19/T5rDanBgBWHThNuvRM+5cMxXkz5SsYqzIMSboE6\ncGFfpdeFkoiumQsaAr/EJ6CigNnVnpW2UP12qIfHI4bBioWFUT1+jl4Eu8jE\ninAq0vhYzh/tFnSZ+bGuHN7NG4BUxk61F8tvecQh1NgHweNXC893zN9tt4Wv\n328RLPvQ8bzM0iBJrifti6WRJuGV8WogK6YjW2zVFC0N1o/UyKks5QuWc67Z\nyOM+65UYYgM7bu2fgyUMBxkFFGvXF2Xmc3bijwHWwyLmAO+bZ0yXV4owjjS9\noX2ALb64EFllM3Pa2dxNfB7uIyjajrCVMIFNBwxuVBMygTsfb6rIneNBNtsL\nBMADp/iM/bfsU9Cqpdx63phDdgZex/5uLyWb+cvsK7HvsLqz72haztwzr8rs\nkQIBeDxEOzLsv6zZM38Ra+Kr8tCwPhwcRJsws5pYJoyIiWOr6T3gEiugSxjE\nZ7RJyQxKTTkDZcIkuM4Cj6nHegysm/uSjEmwBfqV+AW18NT4LFaI4VSabKuR\nE519\r\n=SylS\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/mergeConflictMain","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","browser":"./dist/browser/mergeConflictMain","engines":{"vscode":"^1.5.0"},"scripts":{"watch":"gulp watch-extension:merge-conflict","compile":"gulp compile-extension:merge-conflict"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","dependencies":{"vscode-nls":"^4.0.0"},"_hasShrinkwrap":false,"readmeFilename":"README.md","devDependencies":{"@types/node":"^12.11.7"},"activationEvents":["*"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.3d4ff091be_1594514588992_0.6091327955747479","host":"s3://npm-registry-packages"}},"0.3.0-next.aa930e5619":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.aa930e5619","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.aa930e5619","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"adb538c515d6230582f2fe910957c0cdad13e326","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.aa930e5619.tgz","fileCount":13,"integrity":"sha512-empELFmAMmGxcygf474TUU9wpHeCIoM+934U9njaBKzLoaIbVHDt7LhKVcxqvhuULUprz8d80fBkC98g39SONw==","signatures":[{"sig":"MEYCIQCIHGI9nwhylxUe7tfsA7WR8iEZmAVxreMDT7G0t6QQggIhANdTU5zEXyDHiYbRPU0siHDaP/ybo46LjK18et8tt7KU","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":107155,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.4\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJfC67qCRA9TVsSAnZWagAAWdsQAKPu95j18jpkWsSa6Ysv\n16uyQ5e28+2pAqhcKGpqwjPE3P5qjLcua09wxCxeWyj8Ax4lhtly8LgGICzj\nRZKYArvweXuN+9HB6TGUIort77jLmnV31uuzhpHYedezXzdQrEfcwDMTnNsP\nR84q9kD43k8TnfTUKsxB7uHXGcb++23USQrbGyBl0DNp4tSb8PmcQt+tewzu\nH40bw4xviTdB9wYT/mqVs+PWcf0G4uTiicS3F/q7Rah88d3aJdWltOYekUBA\n6uhawZg4tLtjZvKUZsJwHPnvccxnJpN9W7Fg6G9bg3zcsGMFtdP5eoJLckOF\ntX5wji7aX5YKPq+7w8O2nscaJwuPQlWpigl7hya1tekyW4rP3eneVnVyXaMF\nvQOYwwIer9q03au2kupnRMcmK9YK0SNDqnP205Bi2cqSy2SncYdwMzJBCu4b\nwayMQXWgZ/UHm/9kN5HTKdBeWATdCnFoW4odlhJunicjWhQuM+H+4ERMXo60\nrnyVEppv+hyjMzhziyYZkYySYuFbwif7iu8hOxni+0vGe4/Mq2SZFTmwxRRN\nWAm5mDBglFFgOq6OF0FvGMecUUfh51Dfce4Ft1r5ePtQO7hcrTB5PwjD7u7d\n74iqDUJTaQNKt2zWlloovFXZszNuR4d3/o5qqY7BkPIMuI1vOT4mfLSaWxOa\n+M12\r\n=efCE\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/mergeConflictMain","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","browser":"./dist/browser/mergeConflictMain","engines":{"vscode":"^1.5.0"},"scripts":{"watch":"gulp watch-extension:merge-conflict","compile":"gulp compile-extension:merge-conflict"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","dependencies":{"vscode-nls":"^4.0.0"},"_hasShrinkwrap":false,"readmeFilename":"README.md","devDependencies":{"@types/node":"^12.11.7"},"activationEvents":["*"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.aa930e5619_1594601194302_0.14585818607045375","host":"s3://npm-registry-packages"}},"0.3.0-next.f4d766ca55":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.f4d766ca55","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.f4d766ca55","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"576d7032584ef9621bc350a881c691da150d7cdd","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.f4d766ca55.tgz","fileCount":13,"integrity":"sha512-FIqCo8oybDaNxjm5aU95SfFaGXwQBrxGDUnUzM1JUWrJ5KcpIE+ZyC7gRCgFOYlk0/NWF2UCgrip/o7KhV6aog==","signatures":[{"sig":"MEUCIQD97IZenzhRuRoQrJYkFGu5nYu7ZdjlTUMXj2xVeRP08wIgVvJi8YXQzY2BFT9a+5YAkXSQXTuMHFMPPYymnK/3dEc=","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":107155,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.4\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJfDP96CRA9TVsSAnZWagAAkl8P/0xEvhgT1CtENHjAoPIW\nnuZdOIQnUwY0aEwMnv7RklLPN4USHP0jOyJSA022FzzdZAk8v/wMMOSbDZE4\nMBq0Ep0CciOeyyFMBlKLXy6hl79+jHv4fujEW/XQotnnkv5T2jmR8IuE/ff7\nvl1Xx3do+wLA8MqYGQ9CkzXptBb4YehGca5Mj6qgR9LgwOETlGbDWu5YdalF\nVmKDtLKtJ6jLanil4t1HFPeFdns/F+eI2T6lJIm9Xe41zQL60tuC4sQ6DKdN\np5Gd5E8NuHVQaux9Zh37OqfMLey6uxp0xRNdRnN2+kqH3c98WtmTKjBr3OTK\nZVXKVOupsXBVjugu8HqoMscXo7fJJz+fklEIbLEcjhZDAYbPx+33YpjHmX/w\nDsTPlkFNQ+b3+Q7uFbeZ6rwdPbi6k+L2vJ1Kn6b2c1nbAWPzqJUznsr7A/LT\nQblo4Uek1fZxRIchuBA2TSYRCgtBK5qs0UuFyH/79Z4twDXVoz0bkdRZuC6e\nzN2Z5Ye+0GRDjMScoHblZa0g1rKeRPoBWkRC2Ixym95YTu8G2FTfyaOFaV7u\nNDvqn16ogfmAFCoX6j3FikDIcE/KClsx/QpyHvMZIe8A5twwgPfL0DQCxPYV\nNQZsJ1GQwURgVK7lufxAG+3mxnKqtO7rfm4vgkFzQocy+A58Tt7SoACxtdkQ\nx70R\r\n=+Lg5\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/mergeConflictMain","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","browser":"./dist/browser/mergeConflictMain","engines":{"vscode":"^1.5.0"},"scripts":{"watch":"gulp watch-extension:merge-conflict","compile":"gulp compile-extension:merge-conflict"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","dependencies":{"vscode-nls":"^4.0.0"},"_hasShrinkwrap":false,"readmeFilename":"README.md","devDependencies":{"@types/node":"^12.11.7"},"activationEvents":["*"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.f4d766ca55_1594687353948_0.9019431589727205","host":"s3://npm-registry-packages"}},"0.3.0-next.475076c2c5":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.475076c2c5","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.475076c2c5","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"d8d0d3f9edfc16c4e178260db7b8dd31684b5007","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.475076c2c5.tgz","fileCount":13,"integrity":"sha512-oPZm3+mr5pbT+FZW361T78G6bkrD4hLIoKmtUsWs+4Xwa6ws5Bsw6wpt7rQ5F1vlPT19I/CzOq0ehnKupvb1gQ==","signatures":[{"sig":"MEUCIFW5t0KuTfw+TIMvjLoHcEVe1yFrTPCEahPnTugB3g6WAiEAxaZOfR4+3XyEy+jl2YpAiIj/yg6APd+l54m4zN/YZ8w=","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":107155,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.4\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJfDlFgCRA9TVsSAnZWagAAlzcP/1n1CMP6V6hHp4kGxZw6\nd57/RtoOYBljUdRPIhOrzVnK4vsV+20uN0NTHcsNSTtj3kwQP1jjIGMGDUiS\n4nRGuzF4rozfwNAHSimY4FFDQLJZO1UedUy1/4KiUxGh2I3qfc/AIso9Ir7k\nFLzDNF3QEH8xIUdEijBUMFNS2bNU6E6RH8yj1pt51/IJNHGDG2/fq93K0kkr\nz1CP02GihwaGVG88kHB6LZg7fjEsiXPlkqsBsi/JI0DvHMwZ2HFzjUI3Nl/w\nXIi7Sk1I/hGtEkO36oU5rVhTWcPlxp/B18eUoPb0rEXLw1C9i5OnfhAmJ5+v\nRMgu4ctwfiIOE0pRDq4+2ygdUjhz4nqPpOKXBxk4IJmEZh1e6r+wfs4OLOv0\nXC/32WtSOeQHr3xRtnP8iU7amdSe9dTTvz+qLWXZzTwAwHOCfNdUu5no1x1m\nKePHMKWAj/AkEPw7k7bAwSclxL87IDpauvJVXHD25ih1I6Myg5bfydOZ6ANa\n109qrWDYRpRZb02l8I1W8JVCOIrWXOZ/TN1ePChtR7JKQjKYuaPi8G8wPK4/\nZH6hLiW4eL/tGl30qqLhkmQNU3R/XCtInlrsBqrTRY6W1EC3Yp3loJjhH3KE\nIbEN8YDtFfLeZ4qV4IckZjf5ztPUEX0OkwwCQAQeG+oUJsgPE1RaCLpIu7/f\n6ORj\r\n=/9kS\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/mergeConflictMain","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","browser":"./dist/browser/mergeConflictMain","engines":{"vscode":"^1.5.0"},"scripts":{"watch":"gulp watch-extension:merge-conflict","compile":"gulp compile-extension:merge-conflict"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","dependencies":{"vscode-nls":"^4.0.0"},"_hasShrinkwrap":false,"readmeFilename":"README.md","devDependencies":{"@types/node":"^12.11.7"},"activationEvents":["*"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.475076c2c5_1594773856475_0.045100831053341395","host":"s3://npm-registry-packages"}},"0.3.0-next.48f23d838f":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.48f23d838f","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.48f23d838f","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"62fec4c66499dfa8bd8596bdda2421b2bb3bccfa","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.48f23d838f.tgz","fileCount":13,"integrity":"sha512-Xv5nAzNNJIo2PiIfSoST7KP6eIkDLvgbNPv9JrJZsnPULc7TjLlcTh3uDDWvABHP5VcnlhM3ueZyCmK+alvpow==","signatures":[{"sig":"MEQCIB2gVkQwQwvx3NaE6TYe7dY2XdwenHry994LJTeyOpX+AiB0kMeHVP8zAA6RywVuRehoRjbAEt+9jxtToXeqLCF8Mw==","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":107155,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.4\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJfD6KmCRA9TVsSAnZWagAA4vsP/2MC6UgkC78d1vbI8c/d\n+5OJItz+JTgG5cvdTE+FWMVMADf4xEFPFwE89ImhgWhuBHHAxIhDKdXvIh0z\nHrN6+/Dow4QU73qOZcgCWOe5Ss2NBrA+AHzxNcd/4TEfmx2EOtrvSxAZ2jCL\nbGFWzuZDstYzUKbPMZCSu7/zGGOkqZWu/Oa9S7XCmjwtmD3RfPTEe/EZF+dg\nMsjqsEtwvJYR7r4KIOoU/Sl4fO8daSOM86u8C6HkDWPVBYKb0sL1YQ9rFFIX\ne+pcW0QQiFxAzPIK8JfBf+A91c1P8/jiRspIa4wVbkI/LmhoisDSavH4wiZv\nGIPJeKurEnPWi1nI5r0mohnGEFDJQTcc0OCkcx14pkQwRFviRLkwk5eNETrq\ni97ArO8T6vsoFlxyI5T3SLPeTEgtf7TIRKZzJ4nxTT7f0IcntaD9Xr3evoFY\n3ZA5tgs/iJ+8yWbWknDHvJBJuJlRdTSzxPXAWsfsAgj0bgepjIz+wn9RHlqb\nYujdCYHowPkCeGdn381T6dkhpikIV6/3u54YvQ1qtvGTz7Vlbu/vN0tkoFZl\nJiHr1VoKg+4zXnnzVg1dIzpaeVKX88mtkN2nOBh3CorQTedWClSJsSlQIWr7\nOYvZWNb93q8BeVDWavXquVG29KkIA/nt+du0s6lV7paD293D69bkyH1flr31\nky6u\r\n=1R8w\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/mergeConflictMain","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","browser":"./dist/browser/mergeConflictMain","engines":{"vscode":"^1.5.0"},"scripts":{"watch":"gulp watch-extension:merge-conflict","compile":"gulp compile-extension:merge-conflict"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","dependencies":{"vscode-nls":"^4.0.0"},"_hasShrinkwrap":false,"readmeFilename":"README.md","devDependencies":{"@types/node":"^12.11.7"},"activationEvents":["*"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.48f23d838f_1594860198213_0.029228219602314587","host":"s3://npm-registry-packages"}},"0.3.0-next.7099dc0708":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.7099dc0708","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.7099dc0708","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"1eff9cf76c1655bef86cf1e6b84896e3e05ace0c","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.7099dc0708.tgz","fileCount":13,"integrity":"sha512-I10++dMZoBNcAuUfog/3ouSOBzUDp2OcTPPGhEQs2f0AR0ZipB0M8DDU8LZqgVEZGk6csLPMYt4YnX+hZqn+8A==","signatures":[{"sig":"MEUCIQCmok5D7wq7onSuDGzSyufUVYwRn9k8fFwDrjgJjOb0uwIgYZvN4+op7BIyniP5b+ZO08UMa8cDUp3d5rDKCbsT0RU=","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":107155,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.4\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJfEPSUCRA9TVsSAnZWagAAsaoP/1E+lrQVTOcPwa1kCnSj\nPCsvzCm1sKjHCg0KB/h2X7FvxOg1Z3wYrh9W5ST27cSI3/OBL68ZCVqdeCEt\n5bmqnMADbypPawyCuHFm0JWA0kgFmmMsk6littnOiMkvyLR/NAYO87fqX9iQ\nk5LrMcwh5HCJaJPznY8wf/4ADRc90AQv2Yca1ZdjQY8B77Z6NAbDWDjfRQ+Q\nok8AT8s7/G9UBStBM9Rg+23t9IkMSQeRSltDSII51lNhGmrh2Jl54Kl6IhBv\nwG+eV6JcKbSXTV103O31R10rmLbymrDtdEPlllkopBDxXCqnwYg6MtHu8dQn\nHND/5Ehi6JIy/bIgugFJHbE61pp4sAiF8KXjn44/Uz6innzsoYVlHn7StnUG\nfagt9lmaPGRnnu60EMoyYdJr6h4KmW4V41ksNZhIM6PrXOFpLsL8WKMwz0cr\nr4j7Uck7SOMScvBTZ+wHtMkKR7XYmC1hL0+p1HYeg1VisqiQVq/WuJygNyW/\nCgc7VDnAF4TTBNtRZ8wld3EnacTSg87BSq+kMpkQbQpcMmvBM3IPA+HefYrc\nkdtQ+mMfQOzPy0+2DQXbwDUbB9nvcN5OJW5v04PQ5JFMbk64Rp0GxwapFUmc\n0PylexnPTa288uXP22jvjoxlJOmu0XiNuh8M6gNT/+Csn20gBDUTJmS72KOu\nSEwu\r\n=KkFm\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/mergeConflictMain","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","browser":"./dist/browser/mergeConflictMain","engines":{"vscode":"^1.5.0"},"scripts":{"watch":"gulp watch-extension:merge-conflict","compile":"gulp compile-extension:merge-conflict"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","dependencies":{"vscode-nls":"^4.0.0"},"_hasShrinkwrap":false,"readmeFilename":"README.md","devDependencies":{"@types/node":"^12.11.7"},"activationEvents":["*"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.7099dc0708_1594946707604_0.30969625696496417","host":"s3://npm-registry-packages"}},"0.3.0-next.2c609ec4aa":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.2c609ec4aa","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.2c609ec4aa","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"00ec3b3e4da860d029ca12dbc787c5c0192951cc","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.2c609ec4aa.tgz","fileCount":13,"integrity":"sha512-ki4JF2jI7+ywyJ218flAYdA0fJXc2XOYHahIzF/OURVsOb2KRcNpRFEn4wt/9RhsfXXfnXJwR9TesuGFFBhViQ==","signatures":[{"sig":"MEUCIGE6wLp1MweXYbbFL5ammHP07SWLC1GlzBSTIlrtHe2rAiEApnShYpdOFn1Hctwqs6ABFQCdG/tBWtgEGoUibGpBmI8=","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":107155,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.4\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJfEkWRCRA9TVsSAnZWagAAqQMQAJJ7uz4B5nMyYZ1L/Zv9\nvx2COpbUu930jjLdxIfil2ekn/0eu7dwcOXYdSbiOsU1vbbrfJ6hmdNfi6IP\n1vKzPpRKdmEiClHD1WTgpzNOx1aeouresERaLUbhPgqp5N6aqit1cW3xLXWq\n5BM+pFtiIJ18XRjbA7uXS9XIpxfRRTyK9zcIRqme8Hf8rEpQ+UU0A7EjHWSh\nX3zyL80GRvRUU0YdIDwDwVgnAUwKDtCfacM2kgVYoz7ITUfKT8iMcuCXoK5P\nPRyrpE8MMSbiM71sv56MSJv4RhavG6Gk7WoEX9Qee5fqtCyQbiegWvOz981F\nyGhfrHFuxoUKjiV1a5YrUzbrSzlAuwgTuiHfg6v8viqpVbtUrHEmA/lwkNWO\nneYvprapPk5YEsIUXxLmqiEd0CtDiCQf92RUYc86MFYuqotdakyUhRbZ0yxw\nKo1efW5HYOeeb4cnqbLjDqm9+7KoKjd7ZT7wmmjCcgKePyqzZNrKkUdnRTJe\ntASOXVnbLF3EWquLcu5VNpRGqZ27Jyh69lWRVpUBEFk9Rqr5UXOBQduSWL55\nvtz2gu+3D5t2z/DbBiUcSF1qlcCGT6CwQLj+W2aGaq+a3RcSEOaWd1BnoF92\nuE8UjvNgQOScv5Fbn19YBWypKVDDctFNvpGIgpUKGuPo2DEiXstYbTEWp7Q+\ns+Xw\r\n=QUsy\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/mergeConflictMain","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","browser":"./dist/browser/mergeConflictMain","engines":{"vscode":"^1.5.0"},"scripts":{"watch":"gulp watch-extension:merge-conflict","compile":"gulp compile-extension:merge-conflict"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","dependencies":{"vscode-nls":"^4.0.0"},"_hasShrinkwrap":false,"readmeFilename":"README.md","devDependencies":{"@types/node":"^12.11.7"},"activationEvents":["*"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.2c609ec4aa_1595032977452_0.537517948778826","host":"s3://npm-registry-packages"}},"0.3.0-next.6c21258b65":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.6c21258b65","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.6c21258b65","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"70c3017a170b3a89bb61c11bd28e1c0146934749","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.6c21258b65.tgz","fileCount":13,"integrity":"sha512-qvn/DFIEDG5lrldJOoJPdGbPI77q7KXIKszhWEWIluw7yzOR4Y8hC36YN9TuZ4JospVhXFCr+8iiy19aEMA2mg==","signatures":[{"sig":"MEYCIQCaW/TS2Lyh/QkNqbOJ0+QdmBPKvaTdwS29H0icAI3ELAIhAJuI0V5NI4xomCWZbdMM6BBuKxhykAWsOEj3F1mD5p4x","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":107155,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.4\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJfE5fRCRA9TVsSAnZWagAAb30P/A7QoPBhWp3BAloBQiKj\nquZ9iZiAMDF8bq9OG9Jc5qXmrSBeeGka0o1ccl6xJfWfxcPU59VCWAuKaMEb\nPcBI1+dI2qh/X0kspBLLvy+LME1upLxtu/6U8LYzAPzaRc8r8M4mmFR872QM\ngxm8FDM03QTuh6ihHVuI/xSr86peWuHFnSe7zGg+QpvNVZREfCjC0po4xvoS\n8TJNBhyEify7bzeesGktge1Ko+m/wME9s5aBusWsrADnkOd8WKz/U8tlevUc\n264G1J5wWjpGAnysux72Qk0+sXcUK6B+bLxKU1OYj7iWRqIv6z7H0picVLPd\ng69RdffshDRrVs33CjfHfkWinsIWQAhs5qF06uboHXf9drQbalsD7XYCfswR\nGud4nzvz86J0OG6xwxKdfE9CXt68ePvIte0lOX/Oohg0W/oXUEbBLF+E4EI5\nVKwF+thjmWQ9Dje2JYcVXvwP4Kdt57m1yTxb48LKK/sR2erlQjgxZYDxUhtj\nOKYamfl+VWc4GaMfR5GMgPATiaE3ilLPhTyh4r7RJVx/dfnnsouoUZvd/Y0e\niIXJNKIXDYQuHlg3qSzgsj00KNysv5tI/9G8xKgfUI1yX6BSWsm4hRusE+UI\nleoSgzrqQmqGJtcF60oQWioWn0dKLRwTj9ESlHvRoJM5/VJwfJYIe0D3NVXM\no8x/\r\n=8d8w\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/mergeConflictMain","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","browser":"./dist/browser/mergeConflictMain","engines":{"vscode":"^1.5.0"},"scripts":{"watch":"gulp watch-extension:merge-conflict","compile":"gulp compile-extension:merge-conflict"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","dependencies":{"vscode-nls":"^4.0.0"},"_hasShrinkwrap":false,"readmeFilename":"README.md","devDependencies":{"@types/node":"^12.11.7"},"activationEvents":["*"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.6c21258b65_1595119568826_0.15293286566196063","host":"s3://npm-registry-packages"}},"0.3.0-next.d586f701ec":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.d586f701ec","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.d586f701ec","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"9526ed4d053d76326018babae0a069ca7e63fb56","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.d586f701ec.tgz","fileCount":13,"integrity":"sha512-aiqGM/3m4mAXMiJQ9++24mbXbFj+S16RwWFFlwHH+Qyw8YWVno83aF6xFcqQabPhop8rbRDE1xnVJga53VvKXA==","signatures":[{"sig":"MEUCIQD1bcw9aJA4JIu0RuOBuNtKu/ijSPbfr+5r9WkSymnI9wIgSKzGrvk8r5nsuhg7FC/fc6/88WntgRnWedGl625ejHE=","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":107155,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.4\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJfFjqrCRA9TVsSAnZWagAA0HgP/ix9PpFiPDrXSmWIXUuv\neMEgLNQ1QZDi9+6xsy4tSMo26AIulG5WZ2ewDicHb1JLGT01py+C/CYaY9sc\n9A3yWxU5FFMrZPzk/m4O05dc/Eo6dJeXVVvyKY26frDCCsi4/jSNWGyP46Gx\nKuFoj9MeSCywW+QowWLLnTUm4xu+pkdnQWh2usjA+k/V05vnCGth1GDtn83z\nRIgyqIk5T4EgiRU2usyK873wU92QeZbbRed4+ek0fpH23Jtlqa9Mg+gfs46D\nsvK5W81nR73i5sxehTqviRo75u8CA77QIQc+Ui1wUNhq5qJAxwZqCJkKkfGm\nYYrfgaKmc/Zxbpgd18p/c+2TY6K7xC1kEM/gHfaSqm3aaCCzOAfVKfvtUm5z\nPqACxPyg+21RefYUQWGl6qa2CPosfU5dS6X/ilThQY3uOCopn7z/WCpoxHlT\niO/O3mfIVYLiviFoqwTlzFBjjqyB6tdya3du+ex0TVkPzU0Q3h9Fp1mlVvjj\nAlye57pxpIeuCwygIuMllXTGpu+wdOoE4JHRs5+f6HrWCrBiAmJsPd/vJcJU\nRbdDithCUcU5vSrHt1mM1PWVSv5wFDTIJ7aLPL8uWwPLi2kbJgbOIXWlqafl\n3Nf9mQEm0Th/uvm2lm0RZfQuIadlh1yCsgAfFD5CKVkUYXrJAkPLwN1YxSTP\nOZ+E\r\n=P40x\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/mergeConflictMain","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","browser":"./dist/browser/mergeConflictMain","engines":{"vscode":"^1.5.0"},"scripts":{"watch":"gulp watch-extension:merge-conflict","compile":"gulp compile-extension:merge-conflict"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","dependencies":{"vscode-nls":"^4.0.0"},"_hasShrinkwrap":false,"readmeFilename":"README.md","devDependencies":{"@types/node":"^12.11.7"},"activationEvents":["*"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.d586f701ec_1595292331303_0.2465196768298048","host":"s3://npm-registry-packages"}},"0.3.0-next.0bf4493b75":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.0bf4493b75","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.0bf4493b75","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"34ae1d7e040d104d031028d6bfd42adf48f9a5b9","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.0bf4493b75.tgz","fileCount":13,"integrity":"sha512-x6ANVUeUC8Q3MfHDKNX5poEOjt6MtolIq2BjrgOjg03c4Vg5FQn9WwZr1Z0g9OW6LOr4srlCK+RVVyAbZbLZlQ==","signatures":[{"sig":"MEYCIQCgPwu9LnioJlGtM3J9iIBfJzn/fbVAY7CNSqV31Ri7lwIhAMfEQHVyPewc89XQNwllA2ybA22i/pzeS7KYcByGBbGw","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":107155,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.4\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJfF4waCRA9TVsSAnZWagAAx5QP/RVSof4V1INJGUwKxGSz\nGAqgfEa3k4LUVtiGY38k1iqCwsEh2w+e8m2SZhGgGVMUrmhBoDN46fNx5OnT\nHnXVfig/SYctp3h3o7omO5OMAfOJTsRBAb9Hd9xz1/KBoii+ZxzqBYcM5W/h\nAajX58qKPYM5DRUHiRt0Lb2W7a2XOec3DmByTkTffWrvLTwMn9einGuGggx7\nD32gnBB/6wJE5avlvuB08TwzTHFArwQPzS5x9OpPZt572lZZO3WeGPjXwOsx\nii+l8bVpH9XlAOsDYHi+IDmoUzNFBsmavK6vL2cYg1WBq17BBXY6pBVgFprm\nKjI9ABdc1lLCkYfgXRYw3RHiI1wURvjQ5XMmZFQfTrVcPDS9S8iNuojGCSyI\nerKyl7wyGi2sPASK8UYOhJ+2yPnRTtk+RBDB+wUXnsxYLvB7m4kDmIr1wlZU\n86OLO6+l1+tu/g1m3o5Z10e4MugIs4TpUVPuNuJ7ng17wRb/G6YrcHYPSqEI\n7npT7lpd+5Zv4zh5job7agrmn24GRfnAWtFYo5bdBeNnKF83sI713ncvAiB0\nWBByORwHQy/Zr4EVnFHDOC14EOa9TRLJjB8dxXq3cFTIDfP8D5/eIXocXwpV\nFld4VZZRZd/QGAuYNAGDyEtutjMTGFKNbDhmAYfvKvkZZ21LkvY3s+YkIfvt\n6T4h\r\n=OTgc\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/mergeConflictMain","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","browser":"./dist/browser/mergeConflictMain","engines":{"vscode":"^1.5.0"},"scripts":{"watch":"gulp watch-extension:merge-conflict","compile":"gulp compile-extension:merge-conflict"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","dependencies":{"vscode-nls":"^4.0.0"},"_hasShrinkwrap":false,"readmeFilename":"README.md","devDependencies":{"@types/node":"^12.11.7"},"activationEvents":["*"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.0bf4493b75_1595378714293_0.7489138501164498","host":"s3://npm-registry-packages"}},"0.3.0-next.4a1bcdafe9":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.4a1bcdafe9","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.4a1bcdafe9","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"0cb0e9d19608ff764ef826ce92500f320fd7b102","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.4a1bcdafe9.tgz","fileCount":13,"integrity":"sha512-JbOnOIplVe9JWc+m4gIeVLvO5f/+XZBhdMvMv0YNBx51luU0CsNsFjAq+XAHph9aI+k2mv9JgMpWSR/reLgeZw==","signatures":[{"sig":"MEUCIQDNDB4U3ARLv9Bktnk5WLmqOAsplUn42NKZb7zGEL1iowIgM4Vs/ieUAlyVoO1PbQohS9eN1Nv0Ube7rzoR4hnp+qI=","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":107155,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.4\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJfGGKBCRA9TVsSAnZWagAAEr0QAKQg3qK4Hld070g6TC+Z\n1WslUZK0yxvaf+LI/jMFK7rIENy9uFQ5na0OrkJMeNNHVGSACm6IE56BlHC+\n4x1lG1rnpZ4iJUhEH+6X0k5PIgpUw5M4DOJFW5P0B8M9pDEG72pYxCuNSJ9O\nbzb6OCbaUrEM5OOVltfj6GBWo0dtAvBacaEajJSvU+JxZH+mVobx9xGtg2cA\ni2y4yClkjmWfhWLAbZhoSqy+Gsz6Cih9g/Z9N/hze9uw6nGZBBNSUKSCHM8c\n3ekdQcS7JQTMYiQWP4ibvU6gIY42n/Fmcfmrb/BWZ7axBK5FHw2nNjHau2AN\nR2u0pvrbUI01qqnGepCVQYE0rx2lHW6XtesdnNqVVEKKA6SdfUMqvfPAbkcj\nAJDfxmY/pi8mUZJ3MVV/ousgCcOezqGRJjTFdLrGfPzO//Z+woNq6Uw76hrC\nlXuxQfIeGwWxk/bzvS3kHhW88fWroMNvL1AV0iK00JjvH2cMoNWroEWVMJSp\ncIKhVnG+fAQR9He23ZDAaZ6hU4SRNnytjepRDnmOixXcMrEjJEAEmWWMYyoM\nXuPWGq0fJ4cIaCmLS3JcW48GQAm7e8BfjF/Iz5SGo1zVN2Zi2t9YbFujO1Pu\n82IBall7fKo9WL8xtvcQwIakNy3/LaVDXIov+nAvHbLqqHBTmTVi5+mHDT7x\n/B00\r\n=0J3n\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/mergeConflictMain","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","browser":"./dist/browser/mergeConflictMain","engines":{"vscode":"^1.5.0"},"scripts":{"watch":"gulp watch-extension:merge-conflict","compile":"gulp compile-extension:merge-conflict"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","dependencies":{"vscode-nls":"^4.0.0"},"_hasShrinkwrap":false,"readmeFilename":"README.md","devDependencies":{"@types/node":"^12.11.7"},"activationEvents":["*"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.4a1bcdafe9_1595433600641_0.8815218208583715","host":"s3://npm-registry-packages"}},"0.3.0-next.bae379e986":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.bae379e986","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.bae379e986","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"062ec2f1edec2b7ffe38d6222c378d61f0c24e1f","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.bae379e986.tgz","fileCount":13,"integrity":"sha512-7f0x+cOqjvqyX3Oym8qtKTl3bVCIecZNgL60xIrNHyjwRZGENNk7WaHF4xPNrx0Nu+N/xCWEtfDEqaxKeXDfOw==","signatures":[{"sig":"MEUCIQDEV7ySGGo6PezFYEXI8i3B2omI2RrDvaFkUH3ImHeF7wIgK70YEvMUGUsG3s+zUfAlg7lnTHH07YS2FBFL8area4o=","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":107155,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.4\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJfGN1rCRA9TVsSAnZWagAA+nIQAI7ldKvmJkqv0ZR4n/Jm\nNPaPP1cnXpQZbj2WbDkNICzZcIHYbCtBvTe+VgkpWblxoTsxL6EB63exa7IQ\n/qMMcNzRvyZsmPxG23ewAHTPAvAXO4E+Ve9ojWGG7HYrgabWBrlZ6THa3irw\noQuTqhLFbnfZ4Uh3rZ07W+5TOCBVcMu+Ab/IZd0h/upx7enVtEoJe2qZVqGR\nvpVDJB9TcFSeRC3MaMd521RBwJ7aSEhAMuC/SLwRfCHBNQP/HAav2AYAvOK8\n97sRgumb7uuJsAMc6JtrP5NdJo4wPpVlOIXdoDRP8lghSz1KHJgx9zMEqXJS\nR3WwN8T7eewIXMGAM9bRprjeGxxkxUcdcui5IOL0ETy0vOKN4MUpg4EGC2BL\niI+M7ebMyHElTXgN7V/Si630ZPQyMy0/mUm1MyHTGB4GpmP5JzU4hmplY7mM\n+2yZztMHQ715YlwxqcYh32yfdzmj1O2k4Y30p6hZscsGvavHYk8QO2fKkc/P\nCer5pn2dLQIdLZnxvX5ptAQn25URpBmFsPA2bVaTMORkOyQfdnu7N5zwdPoW\nkJ4Tqt6cReEsrlkt1QH6Dn4HNj4Qbq5SRpAm5MsIqYVePjCrUk+RrvTyjtQa\nDdOWE2a1KDPWOoI0CJ9DJFQc8lvDKrk8+GTE1i+n3P2yyBkQXzRKgdCu1/aL\nBBGU\r\n=LWzz\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/mergeConflictMain","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","browser":"./dist/browser/mergeConflictMain","engines":{"vscode":"^1.5.0"},"scripts":{"watch":"gulp watch-extension:merge-conflict","compile":"gulp compile-extension:merge-conflict"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","dependencies":{"vscode-nls":"^4.0.0"},"_hasShrinkwrap":false,"readmeFilename":"README.md","devDependencies":{"@types/node":"^12.11.7"},"activationEvents":["*"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.bae379e986_1595465066693_0.4311107994171486","host":"s3://npm-registry-packages"}},"0.3.0-next.db170566b8":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.db170566b8","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.db170566b8","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"6c6206cff0e17656c0fc9dae21f59dee71942bd3","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.db170566b8.tgz","fileCount":13,"integrity":"sha512-Tsx7rgo/LPzP25lSdLFFFn/JaOWWkPtUYNv/XjPqbSKPIMEw3gGA+EJD7FHjvcqPlgcAfRTiZSpp+5IpX11Dqw==","signatures":[{"sig":"MEUCIQDQ9S7OTzX8HdfhzEZBbU2XSi6juM9zKXNG8loIz0pwFwIgPc87QcRkE2L6svkp3idTA//QU5zp9AOVQ0IEgkGPFcE=","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":107155,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.4\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJfGi8+CRA9TVsSAnZWagAAZzEP/jiTqQ0qF/DudXuRymX/\npPL/TEUfA3QzOO1rMwx3I66kq06ummwzycFVv4+NAEZKdy+I7SQiyOu55X5i\nJF0Bssqlg5ERzxk96s8e0Xy6kO9zAzvfocXapv5jM6jQumhv0/kB2s9trz6b\nyfLEUaRJX8ldHHT7pb/z2sDlUtZdLsYrUzlCffimbA+EezpvGqR5U8hprgdD\nQkOQka+cD1bYEw3EwfafvVypehNq2mqySmq8t7ULG5ubigJGeUcBNjPFl189\neNLG+PRkdotzaHA7kxDi1ZpMGWUUd4sw4ZuQAC39Ir9KTZWQiMZqWJmGCP/m\n/Gg+RF1FZyxmOacVy3/Tq0PSo5n/fjO3FuQqmt9KnfvbSprQZjqG5sTWlrJD\n5ql4+inAnHcRyEPqJwoQqpqiBIbYB92OSTPdBlvBer9L6CJXxKLiuoqOcFFk\nI45rlIgHh7UdZ04LBdEbtEczxUaFBt0DkEWcHYMyfnHRhhXpJgVR057dJnEu\nS47bTjJF/gF5CT2DDSiMIKVN7TDeh9OAr1PTfm3NVchMHxgtUr09qBPjMba4\np5qDNid2on6x4PsXeMuRLs3pwrNhgmni2qXTRDx8pvRAxGS42C/4hHa1u4my\nEZub6iscH1+j+rd45LyyCaZFm38DNHq5VKQeULgVyZY+WYMj+rt9eCW90/dm\npgBh\r\n=6v/D\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/mergeConflictMain","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","browser":"./dist/browser/mergeConflictMain","engines":{"vscode":"^1.5.0"},"scripts":{"watch":"gulp watch-extension:merge-conflict","compile":"gulp compile-extension:merge-conflict"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","dependencies":{"vscode-nls":"^4.0.0"},"_hasShrinkwrap":false,"readmeFilename":"README.md","devDependencies":{"@types/node":"^12.11.7"},"activationEvents":["*"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.db170566b8_1595551550372_0.3582714663597242","host":"s3://npm-registry-packages"}},"0.3.0-next.c53cc6546f":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.c53cc6546f","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.c53cc6546f","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"8e1d438c41a30c5e7149b1aaa0272d65f3772e7f","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.c53cc6546f.tgz","fileCount":12,"integrity":"sha512-OpszZef2S8B85neUXCra5rj4cf3QsIUQipdQd+Ctb1yNKolsfZ0X1amuW4+vs70hBnWUyQpbnsaHuP/67/5TsA==","signatures":[{"sig":"MEYCIQCI3oF/hGr+WMvZD0yZxYhbOn/A2YCUQ6fG1PhPoHYYUgIhANS40rGa+7Qqvw0yP41oV5DAdqnXwzZp/zJfnIfR60ia","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":106229,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.4\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJfG4BLCRA9TVsSAnZWagAA6LwP/2A8nYraqHvWP0u6/Us3\nyVfHOUrGdOm9hNh9rPxBuE0IIr66rGuohRrbNQ+v1Tlxec+BenDM3a/1spHk\nJUYPQpNfWy+IJ8Xo7xLdeys9DIdzqakV8PkR5k1AO4MnUdocQSWisaOWWFga\nB3S+IY1Y7iHRWuI5Qv7wKv0ycbiINhzOnAUvmyHK2wljddN2I18JI+jeaTuO\nBN4mFboiE4w1XhiRVCSkhIT7LQFzElTNVONBj+3aWtW1BILt0lbSJqhoz8Tp\nnmpdRsT8jBhEdUFJdr+hXgfoqSkNaEHwHqjQ9P8yNZ+k51TSuNbhS1pAu704\nYv80+UORandD4IheBuxqZ3IDBJSUFMrcDPJHqPw6jIKFxnUpyzkOOurWmgaU\nVcctW5mM4YtxS5pT0by36+AEYU8cdmrxe2LeaP6xZBlLF5rN/4UzMono6ZBm\nTaKsnqoilbnbtOyAHkkufciXgU0OIa86OhrHn2pkEAokxn58L+D/12V+nSiM\nfBOCH0KIKv727dkeLl/oJD5+AcYkRZkThcEt0xGuzW0RdQC76xR+GWwrOwds\nklw2xWuN2i2r4F/+/+TjoZH6IgUbcdO9MmRSNOb8pTkFAYTyXBGgAGlQ2CoE\nuXltV4j5wtxp0vf2s7ph1BfGKkUSNkTJLkCF7ZvjA/ZknAbIgbjLk92N6Ccj\ntDbp\r\n=DXSz\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/mergeConflictMain","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","browser":"./dist/browser/mergeConflictMain","engines":{"vscode":"^1.5.0"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","_hasShrinkwrap":false,"readmeFilename":"README.md","activationEvents":["*"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.c53cc6546f_1595637834684_0.22765772735363998","host":"s3://npm-registry-packages"}},"0.3.0-next.e2de23c683":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.e2de23c683","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.e2de23c683","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"712b553fe2240e419e9e2a14a5753771fcec756e","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.e2de23c683.tgz","fileCount":12,"integrity":"sha512-0CVmsAUOtIcTKkpdRcocMz+afiR19ymdehe98UOjN8gsnE2Kf2cskXFNk34Um/S8j8Yh3N6lXJ3GzI7WVFfGuA==","signatures":[{"sig":"MEQCIE4yGHZCblikZfiWaCG/rYEUO1j1SnpqKJVUml2FVZHsAiAaPgh0V9GFnptUoOKHerQgNKGOHgd/mfJPTGZRDzdqjw==","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":106229,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.4\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJfHNIXCRA9TVsSAnZWagAAWHYP/iFf7HySvJCXmkqDpi+L\nfknSfVAV7H6iQs7n00VVEAAFozqBqojZV8J2al/J18O5FnEKh/fu8aY3mJ08\nGG5+O9nwM8vG/pbzG/G2Tr2z9ZfF7uN80fHG06SEbzv3Z0Iuz1W5+BzZSE7w\nPWJX6KOzBtqFVWrgZhfkVs+u008DRu92IHvvfQcs1mse2WkISadLGcOX49p3\nlVkxspTU7JCQ5lTSC+b3zGxij/e3XV+bHxyTB2KVbu4CV/zyUuTycp10Jd3h\n87ug8ObmvcOoiBXoewkVxJcmH8c3FwAOHvL3thMMgIt9iRUf7HFkjIoixwMl\n5ciGKiSbIDHeD5qXFETR2xu8lmp2kUujqsWEmwr9HIfHIhtS065wSRNxPRno\nIuzl7Zs9H/TaEW/Pdi+5tHHj8lOd8PqOiB2h4S6CazEiADhNHn6ehVzU5PRK\nrxZI1WQB20U84zQrE0C5OdLn6Vvfic3ZV50MeUEJNPWCQYw78+fu2+FgKSxs\nmbiLBu/atpw1aIKanf/7lS+3x8thl1zA1yrFY8eoQWyMF2/xhG9EBxnHK2yK\n14vCEy1r2uybUB5oj8WEQUCvNRDz1JJN8MxHdUHJhCKRculac0KAYJeNeova\nzG2W6laxwatOVka4LSzriUHBTqG4pKu+q/wii1VhGnXGUCuT6uOowfV6fwPj\nFtdV\r\n=SBls\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/mergeConflictMain","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","browser":"./dist/browser/mergeConflictMain","engines":{"vscode":"^1.5.0"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","_hasShrinkwrap":false,"readmeFilename":"README.md","activationEvents":["*"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.e2de23c683_1595724310678_0.5573336306751964","host":"s3://npm-registry-packages"}},"0.3.0-next.8ca1cf6293":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.8ca1cf6293","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.8ca1cf6293","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"590219c1f7dc56d6d485006fec527ad003f04aa3","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.8ca1cf6293.tgz","fileCount":12,"integrity":"sha512-TfM9FFJan7S0Wcb1X/FIUa5GdQ7fXABndURB4WrIbYLG+O/+q7TNlqgHs/EiEwsNYyq3irwfqB7CKWsQ7LnJvw==","signatures":[{"sig":"MEQCICEFGVBzFJjmqSPpt2yQDSM7hqYEPokoSdYp6JrQPg1hAiBsrlzaI/3/vJUbk7GW55Ov+ZIpU2s+qK0CQFFi13D1Rw==","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":106229,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.4\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJfHiOCCRA9TVsSAnZWagAAEOQP/0ZWKPq3V5OpkqiCK4oX\no10xbsXDJMIHDg0UOTJEcxhUuxbQe5WsFOG/U+XZOMSS6vbkCshWHzXNnL1f\nlewWt7qbaB6FISHxLjB6W4CtjERJtmIruapUTgLA4dNlaOf3Z/CTTmVMQIx6\n2nodiDUkwvM5AoUZamqveVB7KbO4wgFsgxWWTVHNjjkNVtzEDV0mZQ302j4H\npS+gzmzRLNhKA2FE0Pq1U9KbiCx5g8u+7RyX98DPkaljUYYqy+QR6gKxpbsg\nucUtemHxhAWL4wNb7LWUGCFaGO6S917NQOvHc42tQRDAG1ZKFVWX43pA+pkz\nJGMfMoeZd+CGNOQtozzrD1BHkoQJ0cttFNDVtLm/2y1EyRDXd140VFqNQ1xd\n3eDYXS+ofDsEUDJiWEAAXFR1LcFyHgkHG5qfZcKHqJGwbAzL79lyxIrg2v71\nD7jiZd+owNQNjdlMGi5G5nBe/pjA6Kl8t//sKMMzoG9NpBODm1B2JketGn3w\nIrNwSzMEntVLa9OuEddMhQ+ODXqIRE63ZJiKH8y2Dmu2zhBaMDWVVIkWXzAX\nrSFs434PpV9PaFdHcE9muXrwFVI07hXoWMDLMugn7xJl8cOvdQ70NY9hQRIN\nqsI5UYNdd4FKd10ZFst+czDV5UY+H6Rl7730KL1VATI9dVcozrXmJYklgRkU\nEe4N\r\n=w3/m\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/mergeConflictMain","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","browser":"./dist/browser/mergeConflictMain","engines":{"vscode":"^1.5.0"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","_hasShrinkwrap":false,"readmeFilename":"README.md","activationEvents":["*"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.8ca1cf6293_1595810690079_0.41507412589079773","host":"s3://npm-registry-packages"}},"0.3.0-next.feb05f7351":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.feb05f7351","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.feb05f7351","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"09acbfe96097bfad58332dd7178d8012ab875e1e","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.feb05f7351.tgz","fileCount":12,"integrity":"sha512-Fa5DUzIlb6Fq83Ls4HqNhXJWP6z4cwMnULM8T8fla3SdiW385zvztqwukjB6MOEE0eEbzKeWTS2COIloT8WZEA==","signatures":[{"sig":"MEQCICaA++JksdFwPypXetQUsZjlacOh7PYzhIyzDI3wfyRAAiAk3QF0zuFtf9lhldUJP2c1H5diz+EIhSjeTBv5r4V+xg==","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":106229,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.4\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJfH3WLCRA9TVsSAnZWagAAivUP/3yZ8myvgnMNWlXz/Goz\nJ7ihdP9a140ma7ciaiVyk7/fh9ykdx51Wh/kqvPi5Ccc8mxfAxCkk9RHd4mK\nqDgZNQeAKNiFHh8HgyCnHuB2KC+VOMOz0GRtllkLAzY3X94ExLbUnxReP6Yl\nmXvMfrsoh3LU7YtqX7qd+TpM+JO0DJc4yYaxlnjdALAEl3VcBrehjvO4uEjV\nfsG65EBazyDzQU4Y17wsITmLsRw0rwpEwitfPp0JFv8eVY9OAYJ/jpsnCqtQ\nL6j/5Ym9lkBPwQhwmD9hv6z1o2SQeSgjpOFmXzb9uXKEO1y9KNkUL83e8qhy\njzHiqBEI1h0QGQWMx2oLtmTGAm0iH+bWki2KtAvJ95OwXn0hfgbjIV2sueGA\nIvhxLaJuDFTVaj2hSWysyl9f5xJz6KkczH1FFf+b8NQFgfsZrRCGmaIYw5Ut\nGvigH2zWxEDo4TDa6seFpUkYWRIcBEDrD4NkynkWXg3Jae0ZVb8lP23nmGGy\nByv2VckENpDwz2ite/ikQEJN3csHJTT1Us8F9XXRGXa4JnJIoc/mDTSRKxim\nWzlK1VDUdFtqK1aLQwgJZQ07F/opoUcnSpRvGAARZHkiUNdEhAorME/chmPx\nyrSeBBt7R6mmHoyva06xwjvd66yZ3gV5DGWSTDr7/gQS23+C5QPi3vdVSlW4\nnL4F\r\n=cwz6\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/mergeConflictMain","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","browser":"./dist/browser/mergeConflictMain","engines":{"vscode":"^1.5.0"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","_hasShrinkwrap":false,"readmeFilename":"README.md","activationEvents":["*"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.feb05f7351_1595897227583_0.9274044851229042","host":"s3://npm-registry-packages"}},"0.3.0-next.3bb6bc5bcd":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.3bb6bc5bcd","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.3bb6bc5bcd","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"a31d9d40b9f305ee46c9f28a4675f9fbc1d7bb09","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.3bb6bc5bcd.tgz","fileCount":12,"integrity":"sha512-jZy+pUBHL29Gem7HsFPqXmPomoaeaHGeq3eBChNAjvGV2vEpJwu5E2K3ImywStv+4H9ktzMvoB6ysbHDzsri9g==","signatures":[{"sig":"MEUCIClMbeLcqyMW5mrAvkcmH/SIFePA2CZYq/zUBtXSd+cCAiEAyfOwGHd7KfDbIozKlGQ82t9nzdLbE7I8dh+OQ4+hq8E=","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":106229,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.4\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJfIMa1CRA9TVsSAnZWagAADIUP/3vR9+b+dm2Gg52ITqZ1\nRJKWtw9g2PzRl3N0LpzsGuk9x6skyD/4vxFdstUP8hzgYer/CL/yxIrgZ9X2\n2btx0Q3edQ3dM6Y1dX1QiLiC3iviKtIDvSU68eECHi0iek8PN/LyVWu31KMv\nvNI0JBxyoAM4Cu93Ymop3UWvDmagHR8C2u8SL9hrEqZwcU1psOmJprk+5hTw\nADaUcfDUw+QtqYHpVHdLCUMiEwyCH4YyFLHdR+zHBFAMxH0Lagyji5xiqUcp\n2NPzHYYKRl3WpGi/yPY5qJnCCINskH7qhWdKoCAQ7l5DJY+ylj8SpSqlmVS4\n0r/SIwEFlhS+riefohvIi3SWBCGuhDx4NSG1eS56bpLmxVQCCUu/MkKwR05n\neNZErcxHx9hrjBGFlBbOgJaM1fioAopEwxd18XS8VNry+aFewtIPHIsm//8d\nrC+2/QjKOtE+umMB//EW2GOVH7B+HMyRIqj7MoscSMETXWg49X4etyxRbmGE\nGPN2HxXqW4kaWexXo8VVx+GghVu95UiqMFV6bhlAZk7j3hrs0gNLaIhoviWX\nrkwPcAwSJanpkgW5h2oPfhwVbojk56KHe9pzloR1Qj71wKYTrFi5eyMlnJYy\n95jLvI/oJcC8DiEeFPkZ5TS6gm3aCMni5F93IGXg5pzS4gsv7IWzxFS5NB2d\nc9jJ\r\n=qH6a\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/mergeConflictMain","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","browser":"./dist/browser/mergeConflictMain","engines":{"vscode":"^1.5.0"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","_hasShrinkwrap":false,"readmeFilename":"README.md","activationEvents":["*"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.3bb6bc5bcd_1595983540960_0.8283263388882878","host":"s3://npm-registry-packages"}},"0.3.0-next.c2224dab6c":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.c2224dab6c","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.c2224dab6c","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"46c37d99bd1671d414edc1d8b044a000fd9becc2","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.c2224dab6c.tgz","fileCount":12,"integrity":"sha512-5PBvxQocQFKbxxfuMDXXmbYvkMO0m4Py0PkU9Y6/8ZeZgFEyK7eSM65Uk+zMqstx5xYucPQ5AECWDgNQECS0dw==","signatures":[{"sig":"MEYCIQCh9UUt2RT+0rlujcBuLDq6A0JVdMvZtEW8zMGSe672hAIhAMKoX1bW1KLvQWoeSXAMYntiw8HQ9F2I7Mdr/wKTNO+z","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":106229,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.4\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJfIhjpCRA9TVsSAnZWagAAwQUP/2aYJKM2biaNWo6szNXN\nigGzZ6Sm7if1H/pOmttgm7l49N254zsgeOXa/zSd+plyOflOXKC3Rgz8viSJ\nsfZsA3QNK0h7cirtAoKQd9O6T22f7JYFCEXz0dhXijR0AbDK/uv8/R4/FP8Y\nxv80dVkek2E0YJ4YKggYylxKdzEnG8zdWFTa2nPDpb6mvEC6/HHQpgbUvf/R\nTFiQnYVc/o0OV1j0VTozzydbo5FDSeWmRSWF009JO92Y69p7qN38eXRUumw5\n7+ZYdL9cI/0Lp7bkyjtcX8tUmqtZoZr0c9LBLVPFBAHAca4c+83n6s5J6jxL\nj9rDVTsSePtuhf4VqNRTyommoOa3dP+xZxqL0GgE2Ewmp/sBldOPF4lIgIFd\n0RpoaoMGP1fQJMAMzmc8MfuO83XwYW/tDT0+AAyvPwaj5PuUFq8uosMUBZ/Y\nl4GOShbOddZOokWdBmmNG1PE7FiuPD1Js9iIhW1VJh2O6uBAzHAvkiS1sch/\nph2YhpRGT7cizm42Mwy5juow35oeZ4Y8/mp214OqAH9SFPs4j2bxwLFKdFjs\ndBdlGw9RksP/RyyC8bmCENc35CMS2KQXRCdINkSOx8x1caGOWannRgwNwPPa\nCi0O601vWJUMy5S+W3MibeTAIuzmHRykXyCZ0OJLwCGfV0mnzJFcuiTBnFGU\noywg\r\n=nRhw\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/mergeConflictMain","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","browser":"./dist/browser/mergeConflictMain","engines":{"vscode":"^1.5.0"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","_hasShrinkwrap":false,"readmeFilename":"README.md","activationEvents":["*"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.c2224dab6c_1596070120864_0.6772013155200847","host":"s3://npm-registry-packages"}},"0.3.0-next.cf1b357443":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.cf1b357443","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.cf1b357443","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"a8002473b708cad19a479d20c5001c3f54633b66","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.cf1b357443.tgz","fileCount":12,"integrity":"sha512-zJBuVmCeAONFe2BXYwlXmdRdaO4glL7kHzwkXhwPSXc9+zk9vopLxNCF+LGz62Je65oPtUaRR0ca69WqqR69Hw==","signatures":[{"sig":"MEUCIQDgoUn6XHBU8hTOJ8dMgq08vPnNakV+V+ZXiHzGoTXOvgIgAnpZAmlAZqCVG0jYgKJBP3ugBfi3SGuBexX15mw80II=","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":106229,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.4\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJfI2oOCRA9TVsSAnZWagAA96EQAJAe1zDFkslnf1oWcD5h\n+oYbhzDn0QKN2G1GOBFFr6LTmbYbC6RZwFx1ETIn4pWEVlNzYlhJbsjCC4GP\nTrFP34sj4EQj2x7bXTHZ8PWk+OjaUQQHaszQURtCPKV6m6znOhcRKu8an7G4\nRLiuAcyP8ryeBK8OcNrgBnPPWD7KDFY0YI27Uq80s74tNGdXVuO2AULgAb8/\n/FgB4AaC9zaV9cBzmG6MWp8oxHO0K2Nw1OkwX7352xQSqLeHr7IuI+oGiaEe\n60Hwl7ENEd8LtxqAwFTxwg+c6cr/peBiQbHEc+ojjx/p+yPN1Ox6lVy1CneJ\nxIDSII6i1J4ZQu20s8L7zUPwlHJ7HzGuojs8vwmAO3OXQeCudLpaEDuDy2Fo\nGfTazXLVJFVXTl6x25Nm1Wbuo7WIWqK3OwDrg2yFs3q4ccOdoMOHZuIDh9d0\nNmHkmdOYX4vMejTnAFyO0NBmw1jjV1amjMsl1vNQbQBszg2X/5THxIutEovQ\nERxhJU6Ve6TAiywAVPijd0mM7KuUpzy/J47pDnzH5B8wDbkdNu0lwvL+IygK\nC3rOC3pJP3XgIl7eYT7bpdoGKNy5DSTgvpTf+snPSqSgKGKFlmCKOESahBqX\nxbkCCl8JeIngK9GNlBfdpJpI7suTMBOqNYRNf8IsyVw8rtIS5WYv6U2uq6Ep\nEPF9\r\n=QyKx\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/mergeConflictMain","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","browser":"./dist/browser/mergeConflictMain","engines":{"vscode":"^1.5.0"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","_hasShrinkwrap":false,"readmeFilename":"README.md","activationEvents":["*"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.cf1b357443_1596156430226_0.02768909439660927","host":"s3://npm-registry-packages"}},"0.3.0-next.8d51d4a419":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.8d51d4a419","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.8d51d4a419","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"09284c240db7223552fc1117235946b2ebf0b1a4","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.8d51d4a419.tgz","fileCount":12,"integrity":"sha512-3hx2QhJqNRvsHEdaeDsfNH7P9wx8seuIyKUWzsMrZyXGRQ1HZdVnrytM9TwXTrMDF1RC97fSKAs/8fKN6ejOgg==","signatures":[{"sig":"MEYCIQCzUjtxBO3VKsto5pyiFhIKMRKKaebrpiwwvsH6ZolO5wIhAPceFW3+uvSKaOHHcSqutgQGCpmIP51yHua0XJxT5kB/","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":106229,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.4\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJfJLtXCRA9TVsSAnZWagAASyQQAI001YgjQRKfCL0VqVC7\nsqDgj6Sht6nb7XBFiUj6ugKc0GGMG4rLO+BhjRMn4dWvCeNAcLw5a/g1vuC+\n0U37bvPa7xnLIk3A3eJ4PnnBZQnb2/7saUpOgz0Xnv4SVVS4D7IEU68f9QJj\nhY5/DCbtA3q6nEp1BfUPgtBgGaFd+/hTOQWZFKI+naCA2WvDmQROvADSUnSY\nwrbYBS/wMK8BDrdyObzqm74W8FWvscj343A92S1pddqZfSgHNUgugosdwNuI\n8dEMDyq75gi0jkn4bEwkQ0pCLOdp95y3X21urc0PsjhPcttnFZ154uM42Z1E\nNG/q3yUAHwbSioQD18jT7+foWm26qXitXF16mss3hPqRzpaOJZ0YdDJGr9K8\n8c4vCbbfy6DaGC+Hf6QOLyW9ZGY+OmI+ba2yc56z+XCTYUGxYTDBBhTsWbhk\niGxJ1purR9S21pz/b5bWCDSefsty7Y0XKmYYPuNhlL+dkWJYXD6jYnPuPEcx\nqG6vlU1yIpr5+iJA9yxmQGIf49QIBJdZm5iEbQlEjyyExkFi51NX2f1KFOPv\nPOUNM8urwcD3LVyGRDMU4oVKx3B9YoR5badGOCnBcQN2KhKObO4xmNQ1mqzU\nkPVZXzWsFPs9nxS/rxZWZh6P0FxCwn44jNrGfy+Q8mAciMtEa9+Zv9ioI4i9\nlxT/\r\n=MRX/\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/mergeConflictMain","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","browser":"./dist/browser/mergeConflictMain","engines":{"vscode":"^1.5.0"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","_hasShrinkwrap":false,"readmeFilename":"README.md","activationEvents":["*"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.8d51d4a419_1596242775055_0.7740760948783831","host":"s3://npm-registry-packages"}},"0.3.0-next.eb05e94d5e":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.eb05e94d5e","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.eb05e94d5e","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"0783483df5e1d85ce23b1d1f037cf4b852bddc24","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.eb05e94d5e.tgz","fileCount":12,"integrity":"sha512-R8kSGKiR/vg1U/yg6z+ZZcXjOkgFZ3U8Xt7ikSOk588JZ7PeOB57h1fmZCLnR9su0qdNHl2/1y7bhgCmiCHKJQ==","signatures":[{"sig":"MEQCIEl6b3pkF97o/OlkA5McrezE91ll98t9CzeQx3BtFhhzAiBN0sXFk/hJkpErMdr/YEfWm92bSpCmVxAGC6nQPphb6g==","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":106229,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.4\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJfJg2ACRA9TVsSAnZWagAAYnYQAI8xiOhpz4jPW30S66CJ\nOunMQWQdCdb8ReNddtJYihDcfbvpoUSLjfKSlbfkdb6abcFBOcHN0Vs17LTX\nMjGAnFwGbc+weunkzNN5/UlTBgWtq6x++Mmbd9WFGYH7/UNPxPwb/4fUrM0d\nWsujgd4w+SXi888Qe9xDAcaBkT7IQBudnYKjBnIRKjiIvGxuHvOqfRccHpnN\nDjlI+cLEE3Wmwdug9J95bSobxMSBSfOL3/nVYVCg1p8gpdtJbJH5+1ESslJo\nub4lIQaEIsq9Xafwn6Kqb3Xr7CAVDGrfGSlAPztxsRc8Vk/+QKfjJzGEkPBk\no8s5ZEyOqRZaVkmIZZw6wCptCp1klI+dwWUHk4BJ1VBl705EwPa1veeIcVMB\nk7hiKQAiQR2fNuhp70KRcgj+DyyWLf/SO7m5qqdZRw+DadMAuBSKHzrJ+GES\nIUZcSa3sl/KtIgbN/F4g4TM+id9j5rTuVTxG3QPjPe1Jq9i6CSsuE5iQiTJa\ncmU8+LLly1bQgOYx2XARCSPyFHPrpBa/n0oscLfedOWD4bJX5S8vffaRrNDp\nDBPRMjBsnDqUDPRTrujoV3Dy6SWROgBxuFaiQ+BBnKf7W8Mc59c5j2qSzu2q\nGvYaxo8pAZ+hkrauoTuGPJvH33qi2e08Yt5S59Jqo3srv6rd0njcZCsjr/Eb\nDHnI\r\n=xxZl\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/mergeConflictMain","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","browser":"./dist/browser/mergeConflictMain","engines":{"vscode":"^1.5.0"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","_hasShrinkwrap":false,"readmeFilename":"README.md","activationEvents":["*"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.eb05e94d5e_1596329344157_0.7784798009346983","host":"s3://npm-registry-packages"}},"0.3.0-next.d5327bca82":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.d5327bca82","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.d5327bca82","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"50b8305fd36beb2c4174a661bdabbbcffbe5d66a","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.d5327bca82.tgz","fileCount":12,"integrity":"sha512-BFM/Bq3zObWzM+dCbwLQG589Q19MyRSwSPEqqxQe59XBwd1JEBMNHuxbQW0Jzw82SihB7quqbHmrwKUL3J8fmw==","signatures":[{"sig":"MEQCIFe4+qHq+bU3djzLZiq6M5MfHYl3e9kGr+kh1CuKjAoYAiB/njMMzUw40GtEe5w6sgjsBb+wOjyVK0kTRFQ53MxN5A==","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":106229,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.4\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJfJ16jCRA9TVsSAnZWagAAlHMP/2th4kPUYGkj1RwQM4DW\n55aRbgXsHsFCzVQIcXZ82CiDa4CBOq3rzl9Z6vziqp1AjgKhAw0SOjoXt/gF\nUtPdvnhC3hsSAnPs5mWsNhYQXvqyrQoGewc5vtpjSTOPPEU3p8ko04ICKHTT\nXFHV2+1E4mPmVljhx0nzUCIpVGt5A1bvId5rFEyYLJ+3p/70yMzyalNPgUut\nMbnjuNGKFtYwW3umTGINprj1OaEFE404xhm91KAbBGkivLASy3QDfv4mr8q8\nbo3EoZizwoTIq2HBBUVPtwAAn+iYUDGQS7ktrzLKvg66pxC+rU2FHPL8pcL5\n5mV0rRTYDIZVaIv6iLtVb4A/739BFNWrrMP5tzdVMBWC8e84W5UvGUZgnsSQ\njQKk6H1lS2QEGdJnPBROF9K9XEVwTBWIZfTApKdlxgf8C/aZFv66qTUCh7qw\nR0m+V6WPnJGoKo1z3WBbzPP2XPnUiQ9a3aQBY+RDc0A4kXPVCIbhacsnVUD1\nTkSNecAAbk4nwrH7XEb9i82bXBeQUCXjwk0CL560E0wgpSWuqBiQ+tGEOn1L\nlZlrO8GzJnaGIWUbrq0xb4rXX/DmBUT/8tAc9DpDTF5PrsAr1UZZu0SZjzCb\nUw5hAc1OF1xwVo8KN7/EmWZ0RsyXEcwrx1uH+z5S+R8t7uJNT11WS09rub3m\nV4QD\r\n=1fSa\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/mergeConflictMain","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","browser":"./dist/browser/mergeConflictMain","engines":{"vscode":"^1.5.0"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","_hasShrinkwrap":false,"readmeFilename":"README.md","activationEvents":["*"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.d5327bca82_1596415651037_0.9268605496937874","host":"s3://npm-registry-packages"}},"0.3.0-next.d933c49a5c":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.d933c49a5c","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.d933c49a5c","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"7792c6306a7b06cf13173f185405d2f1090016e3","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.d933c49a5c.tgz","fileCount":12,"integrity":"sha512-AmlTpN4UL5et9DRSHqiiXgPdxqjB96M6NJ0erF/bFSdY52TpED5GUF8SCwYeakg9L90ohSXEm/OOU8fHEX9s6w==","signatures":[{"sig":"MEYCIQCqDI9z1vbUp+rsTIDcIRVgrjW8vgKaIHjQbKo4fFHCXAIhANym4TMlzvpaL2KCYX/HG5nycJVhS52FCJJM/AOw7dJb","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":106229,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.4\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJfKK/CCRA9TVsSAnZWagAAJLkP/3z6TRAJrlOyX1jvju7B\nLEOsiIz8b2yDcDXmnnnVZZW3mqL7C/yq+UTLSaijLNnQCsf37XdKIcOXFOY/\nxo5/2c/WfhfJU5igXRqWMZ8xImx45xcgGFaqjj3+2jgEQ1gu2tRFjkqZh5cs\nKrtd4sEWiw9nSMKCUdUB4kmm3qaa+ShJrlpR57UTd4GH3o32CHi6wkpCIpgL\nDyEnzBkE7ACxWBWJXqHLR9cCoSq6lfved+049ZoGmTUIKgVcIsJ5kWeUX1J/\nMyBSK07HGVjVsR9QxkaLVI66Tp0DH9UA1WYgRB0mKrjTtFGUebRcl+USe+5+\nC4rNhuzgz/XF4CbFyg++/SqLAlqIwWzn4facxsQin3B/ntv8iVkaxnWWVSIs\nCqXrdVqD1DIwBgQbRDVbk4/TM/TWAlYXydVmR9W8BSe3d1lO08bWu4o89UoO\nx/H0vZpgoM6YLIeStRufUxCyZSwx5e41gItgoUc8ntbfwwycBWbjGvVXidry\ntEwY+NvNzrAMJs8oeI1hCyZDbr8OpIUk9W2v7IZEjRX1hCdJAoARfaXcw9qv\nJNTyHV0bcq29PWXG+VZeIqmMpUanIWLeXcddkWA2vLJcBh2kre/2pOiecyXj\ni0KYq12bmH3EjySHnfzpzRz/qxx+/W96AZzwKsX96a/sOiTXqodwZ6g1iv4H\nguyz\r\n=tXC4\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/mergeConflictMain","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","browser":"./dist/browser/mergeConflictMain","engines":{"vscode":"^1.5.0"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","_hasShrinkwrap":false,"readmeFilename":"README.md","activationEvents":["*"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.d933c49a5c_1596501953905_0.7041369433350142","host":"s3://npm-registry-packages"}},"0.3.0-next.c0a100d410":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.c0a100d410","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.c0a100d410","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"171219a76c2bba1b8c5c4ae5af82a87562489a7e","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.c0a100d410.tgz","fileCount":12,"integrity":"sha512-5RsOQoyQn0SOGJB2rt3S/4Qx2Mzy/fwaErxL51ZdlpO7RY9iBNWV53WnWTEdZA+HD/fGEyHM5vP9Cg/erjOEkw==","signatures":[{"sig":"MEUCIQD/0p2wxAB/73bNJ/JTC6VwgrataRDeDs0lZyQP9eRMMAIgT5fW2Ud308vAbc+ZmBr56ObJ5E4WCIzG01N/tXE5jG0=","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":106229,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.4\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJfKgHyCRA9TVsSAnZWagAADm0P/A5NrGMgeLsfFQSx3BuQ\nfHEIhiOKG+7l1IdcvGnDV9SUysPjjMTfxtU/HSc8HgxWTC01LhY9hc2N9zdN\nOD4v5ROYwRBAOcSn2A70Q7YVuMyPZ4yRKYfd4BUa3J4bUK6p0jb41aHfpO96\ngme4AQK21zNbc6eKV6m1ETxkYAXu+8z+Bq1CKRt9BCSFdFn6jF1D7Yr5VigR\nrGKe00mykPVYNLliyrWsT3rkoLncHHPkNqJaRgXg7p0m8ayfxfaB8187fVao\nUYkUZ0//KMotqe6mFw3/YeBYIcsfGy1P5SpgETzmn9qeStZZqbLMJ6fbiIcH\nJwpvMiGfsKAm13AByJlgNdjFsxyT2/RDAlyTcStVfZOMrQ8zD58E1bjmaCbd\nlu3hiTaqqCLZzr/D/FkJ/iCRJPQa9RcXNhwsWFxmfaD+H1PX8/v/4H3Mx+8E\nZRS5lId3wV1oLixYWZ8Hq8+d6W0LGcFeTOmgV5/0sNt+hO/jbkh8KzFD7Izw\nYu/qnVQInJNi8LKyJKPanXL9xR1yhY00Qsy1b/JgD2C4ON1XyZmMKJTVYTwV\nJ8Z+42jmMfmTpvbjeiUOLsNo/IvujWBhllnmRO0qLsI802HG8yyen+R+PvyR\n0ksrlfRJIkG7PkX9Vzh9Oe5nur5Zl2LJE58vFUIfg0h7Im6B5uLFcxN/CWcD\naxQX\r\n=6AEd\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/mergeConflictMain","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","browser":"./dist/browser/mergeConflictMain","engines":{"vscode":"^1.5.0"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","_hasShrinkwrap":false,"readmeFilename":"README.md","activationEvents":["*"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.c0a100d410_1596588529585_0.46191941518551216","host":"s3://npm-registry-packages"}},"0.3.0-next.3d99a14dc4":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.3d99a14dc4","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.3d99a14dc4","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"f033f84f58a3a352f4f81f8cff40a99f426f96ac","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.3d99a14dc4.tgz","fileCount":12,"integrity":"sha512-8JiCtKhUtmvnapTHtpl58gGPkt5VJQF2VPnpeICDGqnsBslOXY+guW/Ztp4pLKRHSK1LZbFHVWcrZXifWcDvQg==","signatures":[{"sig":"MEYCIQDoHXh54+a8wih8znSIVdJ5BOEZoJxr9kVE1yN1ncXDzgIhAMLgnLXdgYHLiuz3H8b0g6tRXwGuX8iRWJm6jsig1sOz","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":106229,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.4\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJfK1MVCRA9TVsSAnZWagAAHegP/17yUy18MH7vPvfIAwS9\nPJ18+v+Y6d5fxs1lCno4tLnzJTIVQcxCEzP++IFSSr9XfVqE8iuXDm2Gdg6Y\nc/CDfBsxjLYvk4ctgcZ4O3kK+NaSg3LpDfHNf5ZSkmlgIABuoWItCyXyPvE3\nEsdWS/cx5LlEMT4Af0+8Xo8pSuaMuPQqM6Wnzg32bHzBTKIEX+aSL7FCuy/M\nPaFqhOMs8ArQQrHUbIUPBtZZfKj1sh/u1IvEnUZ9pZaBRejHTzzyTbWD4BHf\nqehtjI+zd8xBiZ3FC9MF0elzFp59SAawRdJsi/MNElYKoImqsOvUUlPbGh9r\nNUJe27xhK57HCzEKdNl6ew6+yHisyEC1QWWXpKc0b4xqpFmDYFedF28ZGt+N\ngVA7naNmhNkbdkYqw+0dUokkcwNXhC3J0+R7jTpWpOvL1kQIeNF76U5yLCO0\nxRiypsLZfZ8Fo7dJpukHSu64WaqqGNiaH5oM4C4ByBlwfPH3SiK8scooR0I+\nuQoyFrf0nHsYMyvzbhjuBGkmFE1CbWrFcIf4P9DqENrg2vjQPhuCAarI0BpB\n/mBX0OF6oQg1+GUxQkzeGGDLFegCEdYH/v95JCt9ea8LMNQw7fDozEZm0pbu\nXOW0UDFXZFynYt292TqtbfgOkpKZXwZpfB0DkTJJdI3rOQRuwdj6IqujREoq\ng1eG\r\n=9ZbC\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/mergeConflictMain","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","browser":"./dist/browser/mergeConflictMain","engines":{"vscode":"^1.5.0"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","_hasShrinkwrap":false,"readmeFilename":"README.md","activationEvents":["*"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.3d99a14dc4_1596674837447_0.917747209665392","host":"s3://npm-registry-packages"}},"0.3.0-next.42a9a9998e":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.42a9a9998e","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.42a9a9998e","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"b20deea9f390a32975b68841348382837e115bc8","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.42a9a9998e.tgz","fileCount":12,"integrity":"sha512-ZFnbSrsFOkiL6zYAmGnnMTS0ttYb/sJBO0RsLNut9vvbMQcDvboiAiOuRLvom5OTo2rJXXzc4Wp9O6Gp3kURpg==","signatures":[{"sig":"MEUCIQDyZPDLSNFZqt7xjH2thdNEmmcX3f2YzsqhMY+rcRYZlAIgQMrWDwWp+xk1L5+4nH/1KXc8tL/sEOY1UoGHStYNefI=","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":106229,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.4\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJfLKTFCRA9TVsSAnZWagAAOOoQAKRop+m5/QnQp2nfHaJF\nZlGVi8/zuWjkKnXIs8cJXaVgrNoKAhzBRTglO6Q+5G0NUJyjg46vX07vRzgV\n7/Viq61MwBJFTIHVje0sO2rbf+Em9xp5fNnAHRdLKE6QtK5TSPhsh9sCHXLt\n06SKUG73W4v2DViZg2rVox9XiCMeLa0MNJJmUXa+jjJE3TGzsXVl61usmqyS\n1NTNxdMq19Mjv3CEcRanOCXU3rjFXmjc4lXTgx7JXPGc56PN0tPL5flnxyxO\nNIgRf+hHKs7ICFIebtCBox5R5jdUW6YoKVE2fwVkccTkLMw3vFKJD+/6Saxu\n0oYisFugdl1zh2YPuj7Tj72qEHWrUEOS+JO0N64mCPUeaPkoeo1TY1ZI6gxe\n7FvNah9/022sQc4LLVn84Iqvlp5LGvma4IRYeP44Sn/69w4opkvo/dCnWUti\nC5q5NgJFVPQtWT/WpPgzeU+uKM+l75se3qn0RAeTl3o17upDBtCTgccb7OyP\nMY3P3BcFOPZw3/75QOEpiAaZ8/O1qrv7uDYSeltsM6APOm9kFF7GycaXUI0h\nOaiOM2LTlw0yCVSJP0jsb9X/v+uuKIuSfCg1CvIoPOJEpov+KAVSdDKVx9M4\nML89BgIXPBVsK82BgO+VWWixbRAOau9DnnK9OEgm+Og6Bq4BtSQyfZltMbmU\nfSDS\r\n=0hZL\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/mergeConflictMain","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","browser":"./dist/browser/mergeConflictMain","engines":{"vscode":"^1.5.0"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","_hasShrinkwrap":false,"readmeFilename":"README.md","activationEvents":["*"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.42a9a9998e_1596761284721_0.9975359080869901","host":"s3://npm-registry-packages"}},"0.3.0-next.11c0b60785":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.11c0b60785","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.11c0b60785","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"1eb8d9d4f5450f7dd2f613325b20e28ff93d7384","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.11c0b60785.tgz","fileCount":12,"integrity":"sha512-Sf1j/65Qv10vmyXfT1yv2/R/ZP4nmP4BFa7fpJD3zbs7kql2ciNLv6rUeqKoRJdlVMymfwE36GXCm87HGVJhsQ==","signatures":[{"sig":"MEUCIQD7M/PgzcSxfEEJvFugjxVfhafjm5u/SkfASOldS+jbQQIgVXbIEPYjwKKOnlUSpj6zSn/fME1to8CwfnaR8IAXxsg=","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":106229,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.4\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJfLfYmCRA9TVsSAnZWagAAhg0P/0RKlvh9t/lUVi8NBMsE\nQ8c4PGgNoVIswZk2Zee4KDmtkL/6coNZsjg0L68yfwQAtGXlXedf1fgrQkpo\nuQJvBMFit2ykpft3gOZphXR36FHnTtNH6/2dct+Gyltt0biysV6euCiQKCrI\nE54yj8sNyhnwRkqBBaTm6ko60RbF5Ohwnm4kB/CCUFfWe1cBoJL5+LtjDoM0\nGdrlHYLSF3LTtIJETnnmKkQAz/79mSXpNNqkfqv9/6uyPPfza1xNS3p2574F\npy/IqW1sMDwsK0Zn8eZsfPTVheSvFe5Kh21jnkIBSdLXm+QrO/09FZaRh9ci\nYw47rmv/QHjQFuLGU2cINlEYPuu5THku7IwNx450xSUJ5pAQhLNm9atZAgYK\n7caV7O1ouEg0MmicfA9zIoPyJG3Xuz7D0tnnU/AITPIvdaUC8Y7e4kMSeg7V\n8OV8MD37FexyzfqYjlwAEE58uQsGl+3TGvfVN/MiLzkzGwz9l11KpbnKn5da\nVr0i+oxKoJlH+uzUUtTWG8SNczWJXZWlvzmEz13z9Eu85Yw/29T5jARfh9AN\nMpD08RnvhB6oKwtKBWkE/TbZ7eOkccipcF9DzE9cpp0yf7QsmuHUbplLmXRD\nxaEu8lIpGTdYaskBWjTKIScosBc4BOxYjp36QpqbNTqLjC249Hg7TNkrriDo\nHad5\r\n=SSG8\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/mergeConflictMain","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","browser":"./dist/browser/mergeConflictMain","engines":{"vscode":"^1.5.0"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","_hasShrinkwrap":false,"readmeFilename":"README.md","activationEvents":["*"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.11c0b60785_1596847654323_0.9733186755839114","host":"s3://npm-registry-packages"}},"0.3.0-next.6d913c4c14":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.6d913c4c14","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.6d913c4c14","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"a3669fedd4593d0182299d2950592c763947ed05","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.6d913c4c14.tgz","fileCount":12,"integrity":"sha512-wGc1MrWDy/mPBm3sDXu6YljQCcJXI/acU5VE/tYucf41RF8OtEpi/XDNmHWaGyipD6Lt4NS5O1L0AfQdZkGfUg==","signatures":[{"sig":"MEUCIAt/DQdP7O/mp4UvVd5qLvPotseGH1rXRh63CGQdzpDmAiEA3yydSw2C/JugjNbRvtdwmdAFMWqLLdZsBv32vlGcX3U=","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":106229,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.4\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJfL0hZCRA9TVsSAnZWagAA80AP/ieq/guJ8ZF5Iq0SeCgp\nU0VUD9i937KXcDjC8IcLcqnHMUVz7tkIe7kSGItfUQpyZuWJ5f0XT4BJDGcA\nBl+BhJnqpIxsEc5R6yXqLysz+ytaXqno98EcNbNrD/JdyGHf5aT2uLIakpaN\nhRoVMeEm87Df56Juc+JFlFErkC3kOy2XDJdS8DajttJXp048Q4y79viqwf7L\nqmbQo/S1UoQ3rB1tSjaPl2Zlugk57jgBAyq9Ri3GJjM31SrX7czlV80uYdx5\nzABgN/hiFi1Ie7WOdOWXQkkhFAV368igpdAFJ3yBnGmSQWyyOrS4lod0mmOZ\n1Zmbh1p5gPny4ITlhzyDKLUWYTwlkH+R2+cnboww8uRCb3fRrdAtQGe+daOq\n4JbYOmrotjHA8tsdw+Y6EMtQLPAjm6VtlKrQ04rbmZBgCRsctnnFbXgy8ulQ\ngA1giPDxaCTbrZ0MFUHdbwNJtW9sX7opRTmP+PPOyGOEAi8NcOkYV1XRjl6o\nuXaVkGP84EOZyUCO2ZDOQLFGPvG+BPZh8Q6Wo/hZxdKujO5fHo4muiKVN9/k\nEDoXfn5x+H8m14nQFuhgYj9mSlE7ne+xnFpIFiIeXuYMiBiuix3FhbOPL8HI\nes4RZzf48ipA1Cr/b5JQj7MFMcO5nzu5XBPTvvxn62UNBZjv9yUuN3S+Qeym\njcUz\r\n=757f\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/mergeConflictMain","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","browser":"./dist/browser/mergeConflictMain","engines":{"vscode":"^1.5.0"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","_hasShrinkwrap":false,"readmeFilename":"README.md","activationEvents":["*"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.6d913c4c14_1596934233208_0.37534838499717127","host":"s3://npm-registry-packages"}},"0.3.0-next.466da1c901":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.466da1c901","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.466da1c901","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"e361e48a80e56d926a07b6af378de16aac4fd119","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.466da1c901.tgz","fileCount":12,"integrity":"sha512-R/YHUdpHlg3zrMFSGEgxBbrRGn3wa/rfY/ROfSxkRIDsXZU5xDQg3VnJ5mZEbVKNjG9OZk9V47Bp33EjLibZPA==","signatures":[{"sig":"MEUCIQDQBuTWgfm2W1+XUVZnJ1/sNdQpV9muCDIF653AhADJ2gIgfKBpb00KAe8Lizy3rXTcHNVgwgmXFDT7TCA6wklll1c=","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":106229,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.4\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJfMJlGCRA9TVsSAnZWagAAGLAP/1VnmAO9/0pVw8hrs1gP\nczZxiev5RCyvwuRjdWmChJPAgkF765wJYd2yyhoEjAEr1Bi6IxIRlQZ58zLH\n3XcQJSilPk+0Z7vNGD5onFVuAADRNUmKIWCTWJ5rQkjRTnaJ2EHBv2sNRo3Z\nsa7frjUdGGKeiAYrkVeUZKD4VGI+4/5RuQxWe+Kv/yMa6SzoPHNBWhUimVIY\n84roY+GKbvQB2st2YNtkD304B3siNnmnVvrye766grXcXrXm3w+BCunwSDDP\nR/m+xAEXmQN9WoKtztWKyPCHuVy80SnjwRgZDvTeREXWqlKBmkzXOk6bp24g\ntxdcI4+rWILP78V2/JRYRUKHu1EWAz64HK+ak+AVNWSW22zYQIliD8sn5m9M\n7zZAlY8jZItRuH4JUYHflQLb5JuyclE266mG21TGyGsTtCyC0s/s50N/F5XC\n1VYEqhRpJTG8L8efoRYq1VGYnyivvhXnzbaXtPn17q7ROjEXqSfAChclpiTS\nYqcprtCkwG08L9XWTPSpZ6pM/RLqjs/zOAGYB5DZlufdxnQ9GBzdaBuu7nxR\n7I6Pcj+vAFEOFw9Nn4gzSPl+1xXxvQh6GIqHpctWqd2jS5B5AyCaYG+UOwZ/\ndSR8SQUn6H6laA5vr1IPYxDcxvCZbYPnWK73sYQosCKN8GA2fiAEU87407vL\nXolQ\r\n=7kXd\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/mergeConflictMain","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","browser":"./dist/browser/mergeConflictMain","engines":{"vscode":"^1.5.0"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","_hasShrinkwrap":false,"readmeFilename":"README.md","activationEvents":["*"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.466da1c901_1597020486467_0.7704056247969289","host":"s3://npm-registry-packages"}},"0.3.0-next.9bd54c15ae":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.9bd54c15ae","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.9bd54c15ae","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"2baf2073689cdb6c56293912b4e1f88e55ac4bbf","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.9bd54c15ae.tgz","fileCount":12,"integrity":"sha512-5Ox4ftT9dchVi9rY53IIAPw9SR+TsOwlrUrH7jloUDu2J2jzbeZfqBCQ1/k+pXCXdczX7XkkXRyRiK33Y/+opQ==","signatures":[{"sig":"MEQCICvZXwEgrQmXcRLNjm4d3QpvB2Z5kxJ6tKldsKYiqJfaAiB/43Kkc0BA2GBWov2jTguE7LMIosCRb+t4pTqgzfX2xQ==","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":106229,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.4\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJfMeqdCRA9TVsSAnZWagAAqd0P/22fBvVlfK8Se7UI0RAC\nbsPd/90lfnd0+dFUlYmQinKu5VQwbdo5G4VImq5p02ttwyT7sugZhovTRrom\nh/y9rrcFPMMA/e172okZC/s0gQ/0Q0gMx2xZrEHhOMcM7cBAk69hTRR2CmKq\n6xYS51XmnTFqotzIFte0yA0uZrhmxo3wKqolDD2ML0BPxDT0TNn8yFblsI93\nygq8D7VOmECBjsUzk+Id00FTL32Zz1/ED3xUJZbvKpHt2kWzSDbr+ovYArlz\nFcjZqcTwYiagQVvd7loU9xa2kJ487f9ulAuX61bP69ZFjfgrPQ0+ijpreqI7\nV9j5Y/DXomcSHhvsxLNs9SWzIcVzBpjGuEV11/oWTkMHwaEZw8eDNOt4lc26\nZ0xlEi0GY2/pFXAmEfempJ5tSwrkuyRRCWJpmzH/mHnEOYYkfkSNrEhchhX6\nqVcBnyps+xUUDHsBan789hMzb3QD1LeWt/TAtLCDDS7tLILDd+eJ+pJyL7KJ\nGvTfJJHV8QeP8ZPBlCeox6GQq8UfA9MLy1CZbuAdbi2GEl9VItxqtiENlfbY\nU2OLGvifFCLWLYNLMUnOrKdN8bsnLr5JrZBPL51uCX8eP5iVTNtveL74o8wf\nE9diK0o1QbSP932QjWWbMSB0cT9qSRdgak4/oRBvsL8Xa17+15I6Li2foxxV\nvoRh\r\n=lysN\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/mergeConflictMain","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","browser":"./dist/browser/mergeConflictMain","engines":{"vscode":"^1.5.0"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","_hasShrinkwrap":false,"readmeFilename":"README.md","activationEvents":["*"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.9bd54c15ae_1597106844600_0.9502672553412796","host":"s3://npm-registry-packages"}},"0.3.0-next.4585a8cc1d":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.4585a8cc1d","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.4585a8cc1d","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"fc35b1f9a4a4684456277de2d30c95a67d343582","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.4585a8cc1d.tgz","fileCount":12,"integrity":"sha512-wTNspfjjxcvEtTX5V1qYUZlpfZ49NfHvA6+8YxbC4x+fB05dSkP67J3M9Fe7ZgWIs8hUG/6ggRN9LWDVfe/qAw==","signatures":[{"sig":"MEYCIQCgc8h26z5d1lQYArZnLNM3QrVNhJXFHGYNybpk7+JpDgIhAM9A3nNeN84R4CneV+Usq3+PV1L3g++oGN0NQNDXpEpe","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":106229,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.4\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJfMzwRCRA9TVsSAnZWagAAlEgQAIML76k2rXvP5eRTa0B9\nACHshb3ESJi2tzEHdr7a+gHFcHES6bXxPflFHDGTzMbdiWSmmv7GkSiyCsiL\n2uS/+LXF/JMgtJOOxgezegi0xmuRixg9oYUsy3YFWmJXwCSCit+nkXOuBV/T\nPKpqUwiH7hhGq8NRmQ+U5dYIcVLw3NPyOESKxymdXDj4CMbu+XKoEy+iMtus\nzNnJf7XaKknz196TCLoVkA+tA+PMZW5dFA1kq3sjHHQTyW1LPcDavb8g8+EM\nFvnQoxaDt0uCChgepdErgYd0ODt1r9JadAz4WLGbpEowUygkBTn52+xEDpLU\nVdll+NjxceNUbdEUhKAAwU8+kYb3OUMomVBGhZ+nu0aPZ2xU/IyXbDrG9AJ/\n3Zk8mI98hlnAfthL8kfp0IAwa3HOgJwDn+Or0OkkeMIHy058VkUlY08WvYsA\nu2Mw3B1yAkDM3Nvg+HhfPD3d6z0Bo+MlbsKurfsDr9slYiQIo04ABZzkULkm\nmeWidg8wiDsOYhEqYm5XebUOA3I+uezcMKUMJdC5Xnws6QW+TZNgNo1eBgS+\n0jcrC3mzWjJGi/Kwwl3Li7FXC3vCOX+bgN7UCWuLyo6IxXVuy5VmQF460mNp\n2OOtQ49J8sdOeecpIT4IdwVb+ScN02TP61X4JIhUDyxK3Usf/f/GGbMErcTv\nRZ9f\r\n=TBak\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/mergeConflictMain","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","browser":"./dist/browser/mergeConflictMain","engines":{"vscode":"^1.5.0"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","_hasShrinkwrap":false,"readmeFilename":"README.md","activationEvents":["*"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.4585a8cc1d_1597193233425_0.8730182115938423","host":"s3://npm-registry-packages"}},"0.3.0-next.f7f05dee53":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.f7f05dee53","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.f7f05dee53","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"716ad334d426d996fdbcc43ba413ccd93cfd7191","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.f7f05dee53.tgz","fileCount":12,"integrity":"sha512-wI3FZfjiZQA4YusljYr84JG6CYmZ8Z3NYV9WTSg0We3M3qWhGTTIEH9kQF1yPYirbE88Az5Lcsr2wOKUApzqRw==","signatures":[{"sig":"MEUCIHLnR1Jhyg3QUK8WjDqMLwpmUeQEkGDHehs+GjgoIzC8AiEA1ivcV61SGfhwSMvqZqhMHKtVSMuWh8br3UwfWPAQIdA=","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":106229,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.4\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJfNI4XCRA9TVsSAnZWagAA9OMP/j82FIfwTjrGgTRwVO/B\nNMer0eALB+XKUQVxb3h+9+fvSTMzKTdtV4FZDzVQ2WIX/PqlWLGeAGP0Smfl\nWNcJxT9dKy0foSV+km9WNK/ot3+S4I15DX7qvzsfQ78iefDXzXrWQUikATF5\nltyc5E+7fnsPl9h3yMKogRRKx32I1aWpuYzBxF48xL5iPxrOUHexWcmJ9utp\nu4mKwMXmQ7RbmffB8ryZ8H0df1eeIv11sQvYbrG/qiEW8G45/qX2Ap+04Cet\nfnlwb9MbkrWVT+WXEJWQfR1F4HDnPt1T8GKFWlZL1SdgG9sPlQT1p8Zww+Cd\n8iRxIs4yha1DZdw5/gx+6+ECUvziScpfULlE5ScUzkIJgu3EAM/tio5HlMAr\n7L94bcJbfL7teM2hHqoFLeOIw0MS8SYeT5CGejFVFCJXjUp2jHegQ628h+rA\nDmxNeqv9uSblG2GiJD1HKRLCoK1xkAFNOXzMkqgEMOWBX9++8IBEDMut2g/P\nKbtp1zqzPn9593nWIFtZBoxPtRhZFHg3LQj0vZqf3X36iueHbmHk1zbK0Hyo\nIIjcjS9Uuoeh23CVKi1j1fdvYiAjy1bM4Q707icddTTc9ARUR3TaESrK0rq3\nj2j737rRWQ4EYe7lkZjMPTGiMy0sK0f2uhK/yb5etkZ+B5P4pehoA6+2Alob\n1tqJ\r\n=YHYI\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/mergeConflictMain","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","browser":"./dist/browser/mergeConflictMain","engines":{"vscode":"^1.5.0"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","_hasShrinkwrap":false,"readmeFilename":"README.md","activationEvents":["*"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.f7f05dee53_1597279767199_0.07727724288230142","host":"s3://npm-registry-packages"}},"0.3.0-next.95b3a0a8a0":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.95b3a0a8a0","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.95b3a0a8a0","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"bf04c17b1370dfce154fd864db34d86ea0943549","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.95b3a0a8a0.tgz","fileCount":12,"integrity":"sha512-zwr6Z4VY2827Y33JvxCrU6xcSRbyxSqo2JRD6bOECkEUYS7hAOX3eJcEOgpzJl0S4eZH4LG/koJ3rcLw9lhDgA==","signatures":[{"sig":"MEYCIQCVBbieCt/YlOLhAuQnKq6teTcX2uozds9HExzbQq7SzAIhALeHbYNaufxxYYE0VaiesnI9viN/wDr1mtaTh5D2wkrl","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":106229,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.4\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJfNd+sCRA9TVsSAnZWagAApRIQAJbN44uYODxgLYQZqfpr\no5hQ2rYFCgQ2UXgRmKdTcLlIdBNDca5SGTcGACSqV/fBgeLU2rAjW9nErOAw\nHlt6mP38SC7nVQ17GcFSQBMxGbcpoGeJez7dV+YmzjEiJTonItiUJgZIYvRR\nAWRt0Y4h+nZ8eAZATPbJfCUqcfZUygEPRjxXPz9cMoGqnbnRouSu94hgkpQ2\nCoGLVA5WgIigIcbz9DJllkx77T9WQMzn3Uu3c/w7mgufY0Y7Q0KezH65J+xV\nBaxjYQV2xvVx063JdxXCzZODDni+h39WnvUl2YL6SXlWSDu4hgaojbizoOjH\ngyT6xMJYVgczz0X5ngrkE4d/ijXdv3ViSPSbWyvEGZ4GVF5ttHwjr+ZMUxxm\nlOidLXCgUJudCpErLr0tR39irQU8PSUct2mRwF2mclZdiUcoCpNqkTcwWwzW\nefqr6gO/FGsUEUU8XrGJmBLiX9MGJmJ2u3SwDQUD2NuyTaDdLIQWzEQOIS97\naXQYfJ2tg0Gax+s0iEteo/nA7U6+sm3FhlafaRhSHSA2/3/poODEFDXzs71b\nNiVBDxvT1oJKtwWcVrHC3nQoubES7sEuPtLKN+zvfRoeTwWuRYtGcaUvvGG4\n1oM/qHpry2bbmY8uXG/KAVCnWy5HTCiheadSZIHujBWBzvWHPtvockHcCTnE\nY0Rj\r\n=OTQb\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/mergeConflictMain","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","browser":"./dist/browser/mergeConflictMain","engines":{"vscode":"^1.5.0"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","_hasShrinkwrap":false,"readmeFilename":"README.md","activationEvents":["*"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.95b3a0a8a0_1597366187775_0.35356303033605996","host":"s3://npm-registry-packages"}},"0.3.0-next.e0cc8f579f":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.e0cc8f579f","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.e0cc8f579f","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"2d10d386e15dc2faadfee00a3c5acddf00cd009f","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.e0cc8f579f.tgz","fileCount":12,"integrity":"sha512-ffEx2TPCeGA53QVCRVyWB7rqAaRP8Pxt7EOKGn9OOslt68ahQvHdLsBv0khmlz5mfwhwzuokUyKw/1xLRA4oJQ==","signatures":[{"sig":"MEUCIQDpUkKRHWWd1wnL+enQ+iV7kpXNgPWYwdtFLs3IsFtf+gIgOFg0c8BhQ9tTSzst4lphNPrewvoZ63VV481zh20rXTU=","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":106229,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.4\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJfNzCoCRA9TVsSAnZWagAA0dkP/R9RFixUdqC+oKcOeXzy\nokbOxBkrDsn7jBd92dQ2IQjNFE0HPvSNdk3MwxqJYJXZRmMplq0gZivYNr8S\n9EAysG8mbRptbndrw0N2f3paXB3tYG1Jy4vTFwD8Qqzq5KNntDg9DvArXpIp\ns2yrIfonAfPEsaLVSKp44S2nxUwzY4BihpKf4A5yjh0VGhUXmMHTgmBnBy1P\nKwIGrPqHXb3PTjpYBcb13GMrwacJ7AAVAiACB1DZ2LqXCFuP7Ds59+xrrteQ\nUqfv7frnH1SsBNxEPtmoJspvCexf5K/eIiRxVfXaYVx1lmtJsTi9w/TFUEju\nJt3xDkvFtBZmGzB9MPbhOvaghgTFNrQ7NtUviV3oqGPuqatiT20yZTGSpn7S\n2lAzK7w1doVeI1nIcoig76zZJQQLSvmwUCWuMKLft3EWLXHCtcC4Jjne/rOd\nijNQqvRgFL1XiFw0SVocHPS94c4ryX/vTJz9GiJKTjUo1isQwjkD549AAYt1\nfta0SaKHR54OCikp67R4EYmxYeKw8i/gKkR0RC99HD9NisUAnwtF3oL5o0aO\nuiwOZdCO4rLQe7v9smt67/fv9BK1p6KbK95StKsXRy6wHEJC7PIXOFd6PoEK\nhD6TomqoYt/o+DGykKV70wxlTHtIyQG8BM/v8fG5HHRtJxZgpyrdPsRUkxjF\nzIIe\r\n=m4wv\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/mergeConflictMain","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","browser":"./dist/browser/mergeConflictMain","engines":{"vscode":"^1.5.0"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","_hasShrinkwrap":false,"readmeFilename":"README.md","activationEvents":["*"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.e0cc8f579f_1597452455660_0.9607792554038395","host":"s3://npm-registry-packages"}},"0.3.0-next.0a22f70e66":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.0a22f70e66","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.0a22f70e66","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"fc1815d8150751719c6e70de44202d3071987ad2","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.0a22f70e66.tgz","fileCount":12,"integrity":"sha512-skZ9+JLFf9lqBO76++Lc3zatJh1IylwbwbimUBaNT5zVVylP98RNiZP2DH024E1pTa3Rc25MikOjH6KiFeYSCA==","signatures":[{"sig":"MEQCIENwkrujwUrlm0qYkO12JslSrlFvgg10J+FR9tvuD7UiAiAS81Zi/ABCF8jlDRQ1+bHxDXVi6H6vZAuN3lfiU7dmlg==","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":106229,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.4\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJfOIJjCRA9TVsSAnZWagAAYBsP/jH4ogOWWhQRCXNEOi7a\nNyJ0SWHYKaltvcGfX1/tZk5oUYZ4C34NF5hTIwXZGho/84Oh2r2/BynLS7/d\nlcBwQE3tzA22anW/CBUrhakTqOVHDlBRR4ItGh2kf9+uNsYcTVSG61D92ZFP\n1oSNnPBswWv0yRQEDwO7HVaKE4uzxUSImdw56X1ZPy3iJ4GbTWzOFOUKTgrC\nDRlV2jFQoRhccBFktrgHMG+tNUIENMOHh7+XGsddn69dhFOnfNXhjBm4a1Gt\nsnsd1YTvmd/XdOKTzzqmi3lpNw8EZCQdlVPwLtz0SwbWdaEiIgtQqvDWglv+\ntLKCh3PFkIvGaTXQXOX+oeqFbBV3za6xAFkVzQaRC8RaP6lZGeBrAS/XoCqa\n6nXm8zTNNK3B/PUjR6eY86yUjBRRB70Rvsq+7TVnCs5ttV4EC8WrzqG4GjRv\nTGu4eL6BVHRi6unlCMW/h/ERfqNwhrcA+8M/Jz3TlhPQksOGYPjQ2FMWthFQ\nmg112+e/3ruebYozyi41x1YM6na3hbI64AOlx4s9QOSN8IaEKECWKQRrklXj\niDUUgm/Cxq8nFNN9fCP4T9u9vh/t5ra2/owMR0AlkkEsvp9k0vn5l/eDqNzf\nYxKJWDLrJPdtYdF+o9nLAySyF+lG6tORIdWzhmXiw7M16eThV2fAI6VHA3tS\nvT+8\r\n=HHE9\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/mergeConflictMain","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","browser":"./dist/browser/mergeConflictMain","engines":{"vscode":"^1.5.0"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","_hasShrinkwrap":false,"readmeFilename":"README.md","activationEvents":["*"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.0a22f70e66_1597538915125_0.3192785492618442","host":"s3://npm-registry-packages"}},"0.3.0-next.40a54b0e33":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.40a54b0e33","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.40a54b0e33","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"ab0dea356ee28c593a4097cd8a3d216d04ef2e8a","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.40a54b0e33.tgz","fileCount":12,"integrity":"sha512-VqBrS/vd4qW1edF6H8L9J0AFgjXPVLOyDXn0Gm1FxWCpooBluoOSdw/o1xI1dvv4vjNdXJV2jLdN+4ie+hW5MA==","signatures":[{"sig":"MEQCIH6qJpkivI+MFTLBuZn01RErTQfk5pfQJypVEbaawCACAiAjlOoBBpUgxcP6wmzq7U3DbirRFuwNp0aNDt17e7hZBA==","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":106229,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.4\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJfOdN6CRA9TVsSAnZWagAAebIP/33910IFphDaRcl5aw1S\ny9eSTPY/YtdX1dJbJ807UOj/KJUf++GYfDJKGidIkC2W2yRsWvXV7d0T6zqW\n8BEe27IYEbaKTUta3eD/a8tOCMsUo4u5d4+Zf6FwzWLJdwww9gXC2CzW4CWt\nmOhnN5OayGtSJCExv4OvwjFyoB6ntfTFsOjZ4xLW/XJpqshnpoX84M383Xrs\nNOJWHcJ+NuIzmlTSkWQf9hrHVcfryyc8h7nznzkW57rIgaERYc7Biv9Ss4H1\ncrCOZdQwK0NBrTW/9Ol/eiCsSW/CiX60MNau+3OpVPXd4Z4s/xbI6dEmbxMP\ny8AybZxkp6hwStlWzVU8h1XST5TylYiK048lcJV6D5d4yxiF7ssoKjEvhG1W\nfVjJwukTU4WE9l/4v8M+OSH85mjx56kNcW3z6+eS3dN2sNu99pTJW7jSQkWj\nCp5lblvFTttfBj0XBhQpMZp+FS2FWhXvGs5kbFGHXwi93kOc8QH/lnFyLOmP\n0APM1YzOCBp8F57DK1fw1EBWd7rwq6rkXpj+vgwEub+ZyVSjxWMy9z9Guvk6\ngE5wINA8Mx0BKsCJj/oSG5VxWb+LADzAK/T7Vi1ZsS5t2lquoQ5U+OspVW1w\n3d0TSsEpWuPV3FoKE8o1BbnpS5Ue/N/+e8h6yMhFipiwb86ZOdg9Lboe9vYV\nBMig\r\n=CwtR\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/mergeConflictMain","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","browser":"./dist/browser/mergeConflictMain","engines":{"vscode":"^1.5.0"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","_hasShrinkwrap":false,"readmeFilename":"README.md","activationEvents":["*"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.40a54b0e33_1597625209654_0.8202243873136632","host":"s3://npm-registry-packages"}},"0.3.0-next.624e408a2c":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.624e408a2c","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.624e408a2c","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"e541045ab7e891448fc7f8ec843cc4e1ecdb4245","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.624e408a2c.tgz","fileCount":12,"integrity":"sha512-StjC2jWp0lEQnIF7DisICDzidjPycePvuGK4eAQJNNwQ2mo4P7EMllmVK3BCF4I8cCwx2ffoFDAFETvwWbpOXQ==","signatures":[{"sig":"MEQCIA2P0YpG71oNSz7l1PLemvCmp+p/oIfNrFtbEIHDXrmkAiAfmo0i9XR0mC4zYEuWfbYxSZC7LOc81/OvWe/J9N9upQ==","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":106229,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.4\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJfOyUBCRA9TVsSAnZWagAAmi4QAKDqvhQU4V9d9ey3Tspk\nOsZ3JVMSo0Yv34/8Y7Bkg+tTw6yPXSQ4P4oILIjRbcMGjkrXNpwN5F7SgwTS\nfM8XJu6S6UsYu2uYKhoG20/8vw84TAKD3FgM/swgJ6nfOSAtOBO3FNJ+C1ep\nWkImVTO3VQEQNBGmufC1sAjgrVJWK7D8pQJZQcYGZ3fySjN/hJZVqCmh8zm1\nWz+VCTI1g12Gpk+IorrlgnQfHYG7D4S6PXBhVy5uCNu8hL02YW2DGbh6kihj\n+dAnixfCFu1fD0wJKaC/dGmkZWOpru0+Y+stgvqmVGY8HPI1sA9E0cuIcO9y\n82hlY/pr/bFv475Sh9lbZWSJr+UthrmstLJuDYATkdngrcW+p/BXECbPupwb\no6b3D7ua9DTJECCRfOacSrvYnh8vlLIy+QWtxlvzdYGKLZEOscMYJ1RSrn+s\n+6eWD6FAl6Dv1OBso/1t+oUFl63p65hh9FJN8gZe1HuRoWNe68aBmlN1eNeQ\nHIsgliMx2UzivY3PWDrqGM/OzQn9efANzKsYSDy6JqhdEFHbGacwklV1zswf\nrnh14X353KRG9hFtfBqv1xwUHDUgg3UXl9uYlQwYIZdLHj3CqE0useme0HXq\n4iV25y2hG44F3jtEu4XkqmXQID8jmQL8ZRRFTpAKNKEDkGVTId/WaR0MMdTG\n4Ciq\r\n=/MJU\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/mergeConflictMain","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","browser":"./dist/browser/mergeConflictMain","engines":{"vscode":"^1.5.0"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","_hasShrinkwrap":false,"readmeFilename":"README.md","activationEvents":["*"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.624e408a2c_1597711616583_0.20861399770010314","host":"s3://npm-registry-packages"}},"0.3.0-next.f694b07825":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.f694b07825","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.f694b07825","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"d33465b54a8c8eda6ab3f7cfabdb35359974b0b3","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.f694b07825.tgz","fileCount":12,"integrity":"sha512-cKSgyMOAf3tM8bt0CdSVlpO/lc0Q/dJnn4XmtLMRRzAITj30dNYIP9d0NvTxjFTsanSNyI3JLq+fdtC+IAq7NQ==","signatures":[{"sig":"MEUCID76pBjbVZG3FENGtWiOlxo7lyH0Hcx5wYp2JFzbsG30AiEAtzRFPmPGzzUbLXukJfIMtBFuW04uxWKr8gribEEBf24=","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":106229,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.4\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJfPHdcCRA9TVsSAnZWagAAFIcP/3Z6o1paYjLZ8AW9U7BO\nkpNHkw+drDaKf+clVczp96Bb5/Z5qToSuERNGwidN9YMM8/Hf6lO+u9BjKQ1\nFOLXfSdd+7b2OfgaVSyM55bjg5OFvnfMLrXHNQMcSNanNvuVukpeg/FO7BZQ\nHmw4xnE8UNSW7H8WyTgQ13FEliafBGj8mk6EMjU8s4rLSLWCDZ9XX7XCO11H\n4hBwvOSXStaATQjxI0hOLUL2UD1u8/F4mdUfY/Q+PhI9/zW1HzMv4Rp7Wv2n\nVANPmeQKWkYfWnzkVhtZfsYQ438DHBJpJN79ntHtBvMBYt0VVV3KiJGVDiGb\nHxp2GNqigTghHVzcZUMyRvNFhrn6jozVbGGxLjK9sfwmBa2U4N+0Wx7YkHnj\nHABRKwmu4BH0niEhrWPU6bQnzDqm52Jb6XJaqkEwPEkwtdJdjsC/ovl9aRDz\nM8vB3detvOvQd3CmaJGcGVw+MQmOV+J0k87LL2V868yzPRI1ChoHpJ5FbjHm\ns7h6Vf3jJX/0QkiMZ87K6AVZyy+IoEUVuVs3qPoXP84qgwnUBLcrR3zh/WGZ\nCjuds0Pc0fjf/NHYmJpQrtAjhuFepQgXOkPyWWRb9M14fnQCYXrnriGXeszV\n62F9MNuYK0uZ974KgPWEwaPJ+N2KIecuorCSU8lNXKTIiccaC7j+G8YTpmrN\nAQqV\r\n=ztxn\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/mergeConflictMain","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","browser":"./dist/browser/mergeConflictMain","engines":{"vscode":"^1.5.0"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","_hasShrinkwrap":false,"readmeFilename":"README.md","activationEvents":["*"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.f694b07825_1597798235624_0.1673559599031469","host":"s3://npm-registry-packages"}},"0.3.0-next.64d126cafb":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.64d126cafb","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.64d126cafb","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"4d6ebf80b7c7465b62b30ee4d2555ac2ce0f75a8","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.64d126cafb.tgz","fileCount":12,"integrity":"sha512-JtMu5eOYrFVvxkGL9b9H3Lo58YO4dcYMSRtiOsQ2O7+CL+8zQCoXBfEmPrbjKg587jGE1Wkz5rDAhcRulRWeFw==","signatures":[{"sig":"MEUCICfyXxBsZyQNBQy28I4gu1+PsSo1IQGWIvjNnu+fwv6XAiEAw2fQb4nNEIHSwmewuIJNP0XG9oFhNmNkHimYyKOypvM=","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":106229,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.4\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJfPchzCRA9TVsSAnZWagAAORgQAJ7sR3We9pAaYerl+8T3\nVLuYIFKf4yf8pvCc4Kv/c6qZxOjhBzfhlIbyZd9s8YMBMWuDQXDZWgWYalTD\nGirIT0vXgYfwW6+pkPTC0fyQo1ljMEP6jURuQbF9VQDzsxgN03xA7QhwFbFS\nk2t5sFM4z/IxUqGUBTvjUOjq0XW6mZTEbyVX+BgaE14dsqlrwAVIU0ui0jsT\nYra+NDLp3LmAbM8WFo8+1VnUZm+6zOYPvensWF5AKZrzn5TtG1v40cW/Nhnw\njMYfAbJqFyYtuUi+r3aWX1TgbnaIXWaHjN8/kd8DQU7JZuqL8XkZvYrBjmJ8\nUsItcvdODihJfGOw4+yo+dGT4cOZOObS6vYhDvvGJZmS36D1uS6tItZwOOxN\nqXpYtdFuwLIzsav2FgV9Ks5oaI6mTUtiILuUGiUSD28R+MG+TJg2XWMT7z/a\n6T5JeWY+f9exU3tp1D7f7z78fTOpAW0IM1x+Gpwop3f1DMjDV4mpFKbKImmM\nKMOoyinj2i00LHmR0/haJovvEHHaXBWW4mN+GkI173m3JgY/0ICvZpJizmZM\nHjN/tHSsdjAPD+VjAa+73lH3In00Qwi5gvYi1eGg4Wmu7GW7mXerHrMEr61S\nX+HHL4FYKlsPGlNSgNyYXhBKqeSnZdBPjn2EWbuBHCBkoy4QsP7PmYebWAHn\nnSqR\r\n=XTHT\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/mergeConflictMain","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","browser":"./dist/browser/mergeConflictMain","engines":{"vscode":"^1.5.0"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","_hasShrinkwrap":false,"readmeFilename":"README.md","activationEvents":["*"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.64d126cafb_1597884531346_0.8867278185028225","host":"s3://npm-registry-packages"}},"0.3.0-next.c85c46579e":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.c85c46579e","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.c85c46579e","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"80e582fbde933c4f351273d43cf78edcfcee8c98","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.c85c46579e.tgz","fileCount":12,"integrity":"sha512-N4CyAeV5dI9vAw1pdyvegU1G0+RqGEW0d3hW+vfUyhvWDCZLL0ClGzQXoQoKaYnHlrywuhH3d0YYgjRXb8wc6w==","signatures":[{"sig":"MEQCIHUUMEsYU7dypaGOCEDf3Xs3Ef1MDWVzqsgS3FFtMZbvAiAubeiU5od2I4q5mvvtTRxXI6ig4S6Lic2wd6SatueKfA==","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":106229,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.4\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJfPxo4CRA9TVsSAnZWagAAALIQAIu+SsOb7r+WMnguZLzF\nid4Vxr3icM9d9WqBZR4RdGt9q34GGMSg41oJEh+y+GzAzoxridi/ToQuncKv\nm4kaDB+vqBdfIcUtb98z69jLceY7bW5N3yIycxWQRR6owLay6iB2BFR8ldJS\n9EI1ZNSeJfpTEASrmSJh14DHT9BScSwAD5nECRWyCBotEUf4xEXb+EBocTUC\ntRdBcxVm+Zbqplo4nAL3dt+nOfM59cVkfooa4CT12XtJkMrzjcQ+TVTvEiY1\nRA3g5bD+dFCChq6HD+N9nIx820bZSuUlwlQ/3Il0dpEsY/8+54wE1fvw6CJN\nI6T8tSGph8AvuNa9gm6TmLgC+Hs7J9Rgeri42abc3rscWkKdEpYS5UP0XNWq\nx/EqvoFZAqALCg75jV8WG2yXIuHyxK3WFNlX7xVU5u2M8tMEQj+7ASc15nrr\nouVu7k5TnNTz0Yk7I/vHxspSI58AgS3UAuPrBK667igYGWCfKEszg2IRJK8k\nDnkOmwdm+XFXXN0H7bWo1LxjGYAtxCI++YGehv9b4zEM64zgXELXyQeKRlzp\nDTuLRZBrlpwxyxCkHVYP4589ttwvu7kbTzAuxeSfZvNV1w+UyC9fq+L9mXbd\nvdxBcpiWzZkjxRqEejGRCKuzp2teKY/HZSzaA2gDFptvUGdHOkBQ4tydMp3j\nhwZ3\r\n=7J23\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/mergeConflictMain","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","browser":"./dist/browser/mergeConflictMain","engines":{"vscode":"^1.5.0"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","_hasShrinkwrap":false,"readmeFilename":"README.md","activationEvents":["*"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.c85c46579e_1597970999848_0.5400542243036615","host":"s3://npm-registry-packages"}},"0.3.0-next.c50b5acd37":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.c50b5acd37","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.c50b5acd37","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"5f0c043786e7f7fb66bf5053952dfbd84e413e26","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.c50b5acd37.tgz","fileCount":12,"integrity":"sha512-oUcz3X52/eGfqxGFUR94yZbkYOXIUu6DAhO8PyscvOqojqKDP+NmPcTbQN6NItRcHgJDHmz0VodqNbd+YhCteA==","signatures":[{"sig":"MEQCIGW+G3ewo+WyH32iDj6WPbpiXBI6iWARFmH3H2suCqxEAiABeNIQFUoTP1hPWv0LUBm1EsMJMem7qOZ4M4N1yuw8EQ==","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":106229,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.4\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJfQGssCRA9TVsSAnZWagAA6cIP/R+dyXZCSWWgq90BsoXI\n43b0yp2Fu1E/A6V4VmDawLyF9E/bkihyxQFrtrComRAPEGNVWh0G1xV1yHQ+\nScXvPBJcF7qnMpEfKyERXb8qAC317ZO9ES4cYBhDXFFYaFu/rYswtc3da++T\nJm2hI6AKSp2nzDC9MQVsIcZzG4mvZ3c3m/U3ruqsNQpGXYCNseFeOdD0Zztw\n0Afg9nC/Z1sxQ3bzwg8/LsAmgmqDl8SlAn/IPbmcEgc4PMjlRggwpt74sxss\nJfeOXFBd9dchDBSJiglO1x2EiRl5MrVHuIs2LR5diXJ3JNovwd8EYph3o7nj\n016rAIHJYTC84F2XnnMxZzkdTEO+VpqEBmrV68BlzCLP0t0gepM4QtjntqgJ\nT1YKGi+EzGqZMWKghI6oIGAbEJqtJKtU2DCG6GJnG+3rWnLc0ue8wjasrl0f\np5YpOJFaoMPYvUpQak7h7IFijNZS8TooCQwWglb4vlmGNVKKS7ApN+HTL+Bt\nRZK9QUYjnyd64d2XlMN4pck0vDG/QEvRdHDU6W09+/bdp56gCLJyFxjmca1p\nCm7XmlvKKWx1JmBhr8IyuFufKj3ecdKIM1K/eHGhqkj8OE9XKqvMAwRyxR0/\nKSUPcvy4qRAA5/i+/xtaZOMkJ+LqGCTbpCCCRxUCOG8/vbrOE2Mbrak391Ju\nZja1\r\n=Dwu+\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/mergeConflictMain","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","browser":"./dist/browser/mergeConflictMain","engines":{"vscode":"^1.5.0"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","_hasShrinkwrap":false,"readmeFilename":"README.md","activationEvents":["*"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.c50b5acd37_1598057260424_0.9515211980382894","host":"s3://npm-registry-packages"}},"0.3.0-next.ad40702857":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.ad40702857","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.ad40702857","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"4fcd62fcb95cd5c0349271264d108ad54ef4d46d","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.ad40702857.tgz","fileCount":12,"integrity":"sha512-lHUPR8KN9LSRRgV7GEvsIbYKY3MLE5aFY/8JsVbQIPCiuEQxOnhZ/5PAdmsT4pnjPAwZrylq7xaAyr72wFawZw==","signatures":[{"sig":"MEUCIBcd4ZbdSPubV8Kc8IIlcXaBJz/mjYFISwjOVwJaq/ItAiEAyCNPcg0w3DymRlL/SxDY5iv2sS6bcPIngHT3pcN+oEU=","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":106229,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.4\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJfQb2KCRA9TVsSAnZWagAAa8IQAIC9nutBImLVsavwwoP0\nAFK5XKwI1MYBA+8JoIm4sZWQBR6Ajf1FyVpFJESmXwdZaUJG1eU9x1duVY+D\nRbOzpl4fqg9V3H5igFf18HJ6JcTb1vKELYp6re64jOCTv3gutO6Sjl5hDZVt\ncS7WjM8dIGnEOB7wnwchGfM2srEZp74pE9OdI843jjnQGkoioN4XJjAoabPz\n9/rSG/M6cqhbsidwvUOmtIMfs8ZfLnM7lrAOHWGBNWAB7ovbny9W2zlT5oZ+\n0RONkzICTtvYBxr/dei9quahiL7mKQxhZn91w+RfcmY/YekPmhJVPT+s0iS8\nJhSqYUOlsCw9edKYuq+kPvRz0Une5EHxyu0s29IYgCvUgDfBfvCAiqk4UluD\noj7XmuZjZIEXN1LrEvuN9juK8ZBZk3CyKhWeWIHi2K2TcVfcRreFPdVXTTNX\nGpJppGVma4PL5gV4fSGpxqjYb6dOOT6R5B6U00AUrj6tNU/0iiHnU5/wY1iw\nBOdnHtdS7D8g7GdcRzt1y5+rBhd6tNsa6hvLz7j6uOdl3ykLFJH32CJFr7AS\nkdkbu9APhcyhE/hH//DYX7RPl4qmsLh/XqO45c4OZdZvuR60wDCi5Vmq00nN\nZqAiuFhLB6JNVqsUL6xJ8kzdpaAHxVGodcZ8dS7npWRGRwX0vkYjzWOYb3Q/\nBfNt\r\n=vb5Z\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/mergeConflictMain","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","browser":"./dist/browser/mergeConflictMain","engines":{"vscode":"^1.5.0"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","_hasShrinkwrap":false,"readmeFilename":"README.md","activationEvents":["*"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.ad40702857_1598143882115_0.279274738310862","host":"s3://npm-registry-packages"}},"0.3.0-next.f57a418b01":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.f57a418b01","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.f57a418b01","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"15aa8c79af9fed2bd795fd7dc195b9c691e86afa","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.f57a418b01.tgz","fileCount":12,"integrity":"sha512-SKleOcDnSQvhruMsf+hH6wvU/5EJJBh8HHd/XWyUBJSae3uClnKEsGmpRYpYLW3JHTvriapeN5nFU6O8vhADxQ==","signatures":[{"sig":"MEUCIDssQo/6UVxfGQUFekHo3qoaIO5eY94iTJy2CiAUoWoaAiEA9oGJCkvp/kSTrQHCg6b8nooQIJp841n8hs0tQ3wC3So=","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":106229,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.4\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJfQw6dCRA9TVsSAnZWagAAyQsP/2McXrl/x/qNp1WFVfR7\nOWrBK0GKY2GVpVm5iMAhEzVOM3Php3mGMLP24BpNuc1NdTmBqCKkw/xB33D1\n0NS7omFDwOeKRRVVTnzRCvGZ2uk22kYh6/h74JxsktRI0BfW0Bgc7OQgj22H\nkGr8YGlFYicIkExpZSVpLSm2QO1uPTXIrVKfCkn2DDNXRs1Y/u2lbHrDS67T\n73bAyPGh8r09B6dwrs2DwC6h493KbPUMfNGQFQLApGxseZN88hJjUcO+HD9Y\nj+lA6BbkwW99aPmwIyGBGt9tYITiT7voKSCbN/xWa8wy8ZwaJHpTeYLWdHW3\nMShg5uGf2Zi+wYHeB950dpr0dLmYG56mIz8pS9esrGWUgGSyGQP3glNgdxUn\nI6YMVu7yg05kfp/kYQu3Iuq/EMJEaE/wLoJyW0O7IxzhFoE8yQllgcS6Cr0a\nQ+lA1wNiXzHy1kCHv9+y4HtM47F0tTxyiUdAlel6yxWgH2Ci0OTkmNlGwCG2\nQ6HEtkesegw75WHReHtxpDWPI+iGX4l3syFw89C/+6+HtqDu7I/uIvN3rdqL\nAqiGY++zjWfCXCVU/XFuPtp9PQ8kuAv1u+Dosx0cN8oMxQiEv5kp827Lne23\nC3ihyupmY2IHDDPCCS0ZuxHp0FDH2GGbQYapJD3dhWU9z22IXRVnTRgQj7Fo\n+Nak\r\n=0uE+\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/mergeConflictMain","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","browser":"./dist/browser/mergeConflictMain","engines":{"vscode":"^1.5.0"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","_hasShrinkwrap":false,"readmeFilename":"README.md","activationEvents":["*"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.f57a418b01_1598230173306_0.963853844810671","host":"s3://npm-registry-packages"}},"0.3.0-next.3ab605c4de":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.3ab605c4de","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.3ab605c4de","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"2e9d96fc35112e20e9e033e5c3c1e052186f3709","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.3ab605c4de.tgz","fileCount":12,"integrity":"sha512-hfCNoRDWOf+GBo5Fic0plnx7hrjF9i6qidRI8zb0XqvwXIDEElsRecWlHUGYQlM5d9ohZb9Dj9wN4/YGW9vG5Q==","signatures":[{"sig":"MEYCIQCM0glFnKkoSXzby9owPLU3Bj59a41zrtZbtiZa3tfGlAIhALqdeZizViUTy84Dq4avtyTkSnX4XNWcItD+GJRzIAQ1","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":106229,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.4\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJfRGBmCRA9TVsSAnZWagAAAhEP/iU0gDFrBJmi2sqgMYdv\nfLNaPkILvaKPQTCbpd4q8GbT6TBsU5UvkF8AUfb2mQkw/5jFPsharGxxBRcp\nP8xBmXSc/14u+sabu1yHSIzZZqjPBeBKH6U22kwI9flLeBwxel3HZ2KPpPex\n35olv+y/sd9T3UPn6I1TqhcwojYCvCS/RP51N2S4kaKjgU7pCm+A8Qq6amB3\nqAxB8my6YzhozrkEOwW26ERGFpR9zM13I3VJDZvvYEySOUZh7DbIUSt2iYPN\nlgqGEmpc1zjutVRrSOnfDWBm9cm/AsuuPM7rhzKklmbYbrJMFPbKq8OAAaoi\nuvI5IKgFyQkuIApNPsJbYURRkN7iG2CsHhxyLICmWoAYqbMWUZattgpuxVKG\nyAeI4W232qZH4bvk7hiItq6P3QtNENkDG5RLd1rEwJDBseEeiS8a07ZsVwSN\nTwBsW77PX6/w+K0cMBtfqFriCrAikfL8zA1lnvofnCiEvx2p1WwlumX6I5O3\nZSQTgdFIRJ0w9JDIko9UjCCrQk+DWqw8OD9q+EniEcH/wYFG8Bq2ldSY7sPP\nsBPIhbGnuw5J42WU1rtkqwEL/m4JFxX12nsjUzfshEBd4/iFtQvCp7+3pou+\nMSCo8nXOP/kuu9BKso2wkfD+5/XrrQelQFxuG8JSeSkaimpzr/dYYYbQ6AsU\nJdPm\r\n=DEXe\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/mergeConflictMain","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","browser":"./dist/browser/mergeConflictMain","engines":{"vscode":"^1.5.0"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","_hasShrinkwrap":false,"readmeFilename":"README.md","activationEvents":["*"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.3ab605c4de_1598316645838_0.6060469922505258","host":"s3://npm-registry-packages"}},"0.3.0-next.0f22246a44":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.0f22246a44","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.0f22246a44","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"200fb03848cbb511d58e4a70ab7dff3a77665f7a","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.0f22246a44.tgz","fileCount":12,"integrity":"sha512-TXzmrPQiQm7/G70etGXRRMp+X3a+I1J394rZnb7b91o2fm3iB3ITGuARQobqIVnj/TK4/DiuqP5DcMmjYu66Yw==","signatures":[{"sig":"MEYCIQC4gAGSJuQSN3ySpHpmrkTqAadJ9y/JfqUDJAITE1PkigIhAKv7gZXChbqCTDKhDk6veFMyK8kZ5WpxkVkd1kSXnM5f","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":106229,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.4\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJfRbEhCRA9TVsSAnZWagAAKmYQAISQlU4rSo2FGM1l7yhM\nUrkZpDR92yzhX4HC9oDXvEP9lLmKLNRjlF5r+5Zmm/qkjAyQt45w8Q1pF8Jh\neY5aTcDF69kLih/U5FNwth3Sx+cmayviPYdIQzGCr83PB6+eIg/8HU8c1B+x\nEb5tCNc/0ubOy7M7Yb17j+V78Vub5OilyyBo/fHX5RLHwqkz9xLv2uZ2NaBS\nEizyQPHyVxhDg1dUVo7KQd4Vn9EpPSu+xTkdTZqLVS7RgAHlvLuiZREe2Y5U\nNf1lSjg7MPBB3lGn6vLcXLMloH1sgEMGOcR9A7or7LLOz2zvyUnjdXlOnypN\ntCMQe/4EWO2H8f+1FJ0/b+Ukx0m4MV7g/mlV4ieS+L04wEwGY9CoAI+Pf1DD\nDd07w9vfTlUGPOK3oit65IwJRPQx5BpXUiXq+L0h2PCJhcdVEy3RvxPoWLcX\naJ8LO/hivUsKiIMmhEw52IKSumXLh+CjH0Cu5NelAU2MZH5DEs9x/eVM8sXy\nEzI6/4KCEQ4dJz0WdGS8MtxQYtYvk220MyO0M9hvH4ZoLRiOaMdqixrxBUGn\n7+IP+Obj/MY8A0I1kEhSdPYq6FKHGoSWgCzZv0nQF7GV1jl55nDWXqR+LQJj\ni/Oz3tJaMSpZF7/zXAXUsFFe6G3/56XunfJQbCtoh/hoMpzs60S8UCcEdfJn\nJZsZ\r\n=ZKob\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/mergeConflictMain","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","browser":"./dist/browser/mergeConflictMain","engines":{"vscode":"^1.5.0"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","_hasShrinkwrap":false,"readmeFilename":"README.md","activationEvents":["*"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.0f22246a44_1598402849145_0.1701029164592549","host":"s3://npm-registry-packages"}},"0.3.0-next.b58f4549b2":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.b58f4549b2","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.b58f4549b2","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"ce384c355b28356fbfc8d3f4251203f8b5fabb91","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.b58f4549b2.tgz","fileCount":12,"integrity":"sha512-Ihc/s0vU+UqGsC05pg+1UfvjBgXdT+tOwuNaonfiU1xejKV0V8jgNTq+8OztAfDCkLyuuZnbYnhvYcaFZktopg==","signatures":[{"sig":"MEUCIQD0ptXwg7PnktUqXi+YRDOcoCFMELiYpRSTxeTQXt6DIAIgFEG8HJgVi/lI7/lQQVOUFC12du0MvuG2++Qk5tLEKn0=","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":106229,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.4\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJfRwNsCRA9TVsSAnZWagAAFa4P+QG9d0Fzm1Ldm7MTSqCj\n6xn6iR4lY9K3aHWboV8oDZC0+0k0Wjx31dMeRKKsN8BPKWQEW1YsXxC+tMST\nYb7aNosbYY9QHl1LC8C8E+6TPSvLQcT7+es64nN9FjfwSLdJGu+IhjghZym6\ncutC2ci0KzyrSPWWqOoCZQS0Z4oi/KvgG7rK1JP7U5BN/gos3AWjLKnMkS8j\namGb/7/3K8EQTCbx78zSi48PLSzH05MHmF5w1vBI4V8DL7Eto3w/z9ydjl8Y\n3e+rhrVdXqqX0uHvRRxxwu7IHdk98wgjBg1FJhqnvQb7sZ+PkAt47xmP5hl1\nvUPSIQRoUyetnU2OixEH0Bkui6piNbtshYKJzilUuTunE9I5WcDdVwQEpL/j\nXKZ2Yqc6qTbwHr5li6Zba/igXaRZF5qLbJPlpXeasDeXqImzGxlVswzb5pRZ\nsLhMz6PR4OMSA2GOwOhdC9RilcNQRrvAMFYzmeWmAZmqMfaH5oSfLASfftvG\n2TrRKocj3Aptdkt7mz+zLD4tc6OLwQKDMWbBYuLa09nji5tlW8GdeYryKKC/\n0/+kKISVhmWYtNctpIpxwwAq4si3qF2WJlR4uMt7ZT2z70XZ6uJMD4SnJrG0\nRd03OMbwVlG+5qzV2S4KwKW/AB/duKtl6QwqVO7njHA6TvgG5pXCEand3jZI\neFDL\r\n=FEdE\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/mergeConflictMain","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","browser":"./dist/browser/mergeConflictMain","engines":{"vscode":"^1.5.0"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","_hasShrinkwrap":false,"readmeFilename":"README.md","activationEvents":["*"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.b58f4549b2_1598489452377_0.6120547542255863","host":"s3://npm-registry-packages"}},"0.3.0-next.1d7ff4c718":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.1d7ff4c718","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.1d7ff4c718","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"c71d32f8d0ad6bf78d0e4afc6b9c9eec2489a534","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.1d7ff4c718.tgz","fileCount":12,"integrity":"sha512-sor1hSnO+7XpOK/Vj5r8F8/tP3vs2kYgJdQZhnmFZMRzqpe/qlJXtGe5oc9nIxSxsPGWTr5Rz9cIPOAnRZqXiw==","signatures":[{"sig":"MEYCIQCVN7MY/yCQEHCDxCFEdyGIExTJmfBJx4a3smr9slX+jAIhAMXQrHx3VQiiZYKLvuQ/oBEu3GjfS7LDroFE2pavZNxC","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":106229,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.4\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJfSFXyCRA9TVsSAnZWagAAStwP/j2zWpVViupuzbGJPlQJ\nhDNZz5PMKWvDJpbdCL49nqNDPw9/u+pjnimCsPrMY+kCcTYaSQ9mmSTaES1v\np6IAZQES+65uPr85fF7petXcc9SX66zG/CUkX4sVcHMD+WCkhS7sreuMpmb7\nfGJpgR2DEFg5Tx42toxpGpdK+LmVfCkZtxOR8DjezYnDJlVagks+nWZUsS1z\nyB7gNFLBKL+JQyj84FqKAVDsAMGU+lJhsG3xt5cRT+IjLNZuXs20o7y5QmMR\ndGTDl0LoQ52OAZfwKpSbdFcn9tpwt7PH5C8SePBiqRG93uuxrvFYyAjweqA2\nmPTuNMoi2q8nld6j5vK3NbO5Use/kjaZI6XtmXgf7Ki4Q30VorPlZ/LBKBL7\nAJouFmcePQ2QrdFvNwqqjkxD2nMQxV43Jf1Sb0e8su7+vtGzwTAWpwmkqVVC\nsxA9WN8xLBmVrkl1sjVReapni1jBCLa+pAiQ13PU17aAiQr5Pm8Czos/AUCz\naSs+vh2uCKpwgAS2QdJ9qd6OQb7+Z4JKMrkqFIrLmQvhnTJqkITzA1h2tCGv\ntrQStlQMpHilcQRrSxZFzaJQNAHz76ChVaHnn/BkX7UaPkmHpcJUGiVgB8yE\nXhfzodLJ3IBKKhFAVfHZuxTxal4O/uwkiv/2yI8/3gqTwGPk1aWfE7o8sZav\nreEv\r\n=p0RH\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/mergeConflictMain","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","browser":"./dist/browser/mergeConflictMain","engines":{"vscode":"^1.5.0"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","_hasShrinkwrap":false,"readmeFilename":"README.md","activationEvents":["*"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.1d7ff4c718_1598576114227_0.47642230696262855","host":"s3://npm-registry-packages"}},"0.3.0-next.c6e64d2217":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.c6e64d2217","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.c6e64d2217","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"a2ca9d996d993a792e50d511ecd59226e25c2991","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.c6e64d2217.tgz","fileCount":12,"integrity":"sha512-XLgxXxgpp2ZovE41OaLoBu5NTkIv4OC4iWWPom5zBXBpVf89R5IQCYoznDzMTJmY8/oLsWWSHtvgT9l4sKHFQQ==","signatures":[{"sig":"MEUCIBBgxMYVnWJaKGTl3R2E+82OddwSn+kcqJ4I3jg1IREIAiEAkwAt1q1aYUZ0C4H+TREo6UCx+u9u9zBK99Fj7PYf2AE=","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":106229,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.4\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJfSaJkCRA9TVsSAnZWagAA4jcP/jQP6KGCjMMwQ7TrNGfj\nJ5MWzf10xSjdukQXUkMgIJTX3YJA2iAL76cH/fU/Yb6kiv5lFtNjGWgdXC4l\n0UllhHGV4c6c9yIoSNGsQrrjnw9UVS23jzjKcSO7mUTsaAygykharTlNZN6G\nyR+SVf8XauT3Y9wqoD/oXYCNrB7xyw8lxhsP2jY0dEL3ID5YBCdfiq2mm6k8\nBmUPYpuWzJV7ZJ+UpGblSjyIInFatJUAgRWJ2QLiP+mJj6Zm00lX6TLuulRz\nmFRRlcOCZXaYQyBFlM0vd3IhlP5egHowfteGif071l+ggjt/ITKau3rr9dXz\n9Zo7wAT9JBKyv21hTzbbTG0Aky1g78bgIEUbWFPNHuzycPQUGxR7c+TRdUup\nF1tvgvVyKK8i6r/SmBpbHspJAS9aYlMOr7dTPPhY9vizp6Sfoqbo51RbtWsV\nscowH1JPWkeGSYQZzSkzUoXzeHfDF6f8TtfvLczHPMneeFFlgqB7Q+r0g6ub\nJ3Hfmdg3KmoRYpgRg0+fjYjhgmFcVTLohC5uDCCGAIKvhhhQNkApHhcLLy9S\nePkgYPBxSqR8/MK6aW0yzpTixvuQBAmt3NzeZxZgH/0loAlMQTo6hNF/oD6u\n36GwXdBLBfSMedwexCiiHYUmMvEdzzPCHAWhu21oFvqJEcAGMN6gdCWiyFpw\neVQ9\r\n=xpqU\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/mergeConflictMain","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","browser":"./dist/browser/mergeConflictMain","engines":{"vscode":"^1.5.0"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","_hasShrinkwrap":false,"readmeFilename":"README.md","activationEvents":["*"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.c6e64d2217_1598661219795_0.5482517950697139","host":"s3://npm-registry-packages"}},"0.3.0-next.b96ce60e2d":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.b96ce60e2d","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.b96ce60e2d","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"c12018ca082767c8bab159d3c04e34c7e635cac9","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.b96ce60e2d.tgz","fileCount":12,"integrity":"sha512-v3qn9jlO6V783bC/+EZjHBCm5WwIAlez3QInPdqYXaPyJmo/uqpPKYynIYmKGxKVuGeDxMiRXI8u530ScWBNyg==","signatures":[{"sig":"MEUCIQC6g3zG32FvP/rES5sC5SiBPmyp0ril5T+nHdVYOje7MgIgfN+JfYVdpc+XXq/dOpVbLcVwbNDHP3AX/Lsss0nHTMk=","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":106229,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.4\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJfSvNdCRA9TVsSAnZWagAA1j4P/1wq4COP+w2RJ0OF67bo\nUi5msxS6KcgiEfysYOC/uVHZHrPH8msRvUD3tpog8+k99T45wjT3UZttGx2E\nNKlNc6sqjdmxk3z+g4SlpNAcAaPZVJ/JZytv0/HwrvC/ImmSYe5Ru1dcCHwY\nzgHHFApkjYHGjyD3IUcV3UCMeca079efYWKskt5ZCY9bl+PHML0K2hB0G9Oq\nQgVAz+72dd8fX2hdBSED8pjCaGGbmf232RMziDcVBpLto8qEuqS2Zj5die+b\nEDFBFW0K5Ox+aG4CuGkinpKNuEGKkSxm9iuOmkhiPJQHCCnSOJKXoTK2RE4f\nOETyRWz4Ig/5RgbzjPCCuaZZtNdTulKbX4uD6l0uxStkA8CIxPKwXx02niuv\ntNTRmMD1f/Lwf7c0GhjxA49BFUCRWkmRV4WbUEYNMGenZJFS/giYddAhhw1+\nn+96RgXxdrBCyC+A39edmi5UGm0ZpjBbVvbZVp8QtlNFsa+aBa689l5U24iM\ncNGjpgpBUagVH4ejOTWK4KaLdC6wdRVlxqXZ0lJ3ny/GWu2Q5xF8JOpqyocW\nLkpxlY/fE67Uwe+56TPKyFLzKnrXFQSub9Kilr6NYSiDRpjywcKba5/hZzt9\nn3CJLDE7FfGl5X57lPVNvvfc3HqzETJybXheWN15WgcEDlVjAU8MFcJbzzYP\nPDIR\r\n=r1U9\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/mergeConflictMain","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","browser":"./dist/browser/mergeConflictMain","engines":{"vscode":"^1.5.0"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","_hasShrinkwrap":false,"readmeFilename":"README.md","activationEvents":["*"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.b96ce60e2d_1598747485472_0.255721874086245","host":"s3://npm-registry-packages"}},"0.3.0-next.61d8097124":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.61d8097124","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.61d8097124","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"4e7fe3a18df7656c727aa80239c37472f2e4b674","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.61d8097124.tgz","fileCount":12,"integrity":"sha512-imTO5GGcaq1Z6EdxHCo2D4+MqMygciS2g/JE5/SIgABQl8UVO+4RQe2lHF4fvt5bZcvKSwbeKOLbLsO6v2JFxg==","signatures":[{"sig":"MEUCIQDPDKPciwC6T0gTTv2gaWIma6z4My6Mdm47JDeaB7QT/gIgeTuU6nm+VCSnc39qmotIOwC2LdH9N0ep0XGypfFSobk=","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":106229,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.4\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJfTEV+CRA9TVsSAnZWagAA7F0P/3y6cuLhZi8CYumUSpUN\nkeC44zKA2r9f75s4vi3Re1gK65Gf+XYh4xyX2X+CuMPDOYsPrJHvo8c2zaE+\nIYfplsuRGmErVrcODGDrX9FGbQsx33jcjnDmrxkn5ZniTCd4bwVcQmSwKVPG\nita9cLgj5QppYVA2ddFIsBCvmXedwKijY0dsRYCGdkWEjaQPaUs/4SDsynFl\na8Bn0P6Foi6lKpgR/0lxRecjOP4wQmMnc73tC2Gi00dKz/ufuK+gvJW8DnZA\nl+IF1YtAMpL+x0akdH2NBUuFuuv/vmqzTssIAsWovRwJ4SR2P6KBUy9S3GLm\nl0ceSX2qYF4wf+zqpWFtkFH2YSZdQquLcIRkF48JB5DyoW/er6xuYtfxgs0Q\nWrU4x/8ggMGoWiyWs/tO0EiJ8bFkxkkCGoze7D6ONJ4r+LpLOmpgfzIcoHCo\nka7raPtMJzLzqZvVJz0uPOMKaCJeaLPIFNdvfk+XLwAGRTrTmPd4ppFeLLIm\nJTUMvrqNPRedPNJZePLS92B15KfncXE3xcNV5UDOV40bzR7iWfq5kQMz7Ir/\nTgg2cS1h3u+LpVnXTVBZ7AiW7QRAQh4dbUTRdu5/AW9weYyndFS9NRpTJZ6c\n7QnfbWaiUl9kJTcO/YduZFx2pEFI4fKZwMsWBZhT3l98K5M3CjhmyRtENmeh\nNLNB\r\n=PSOE\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/mergeConflictMain","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","browser":"./dist/browser/mergeConflictMain","engines":{"vscode":"^1.5.0"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","_hasShrinkwrap":false,"readmeFilename":"README.md","activationEvents":["*"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.61d8097124_1598834046374_0.9146969151144912","host":"s3://npm-registry-packages"}},"0.3.0-next.98fe9425f2":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.98fe9425f2","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.98fe9425f2","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"6cd17b8ae07d36afb8c2b1bd9c4b30e660a8d935","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.98fe9425f2.tgz","fileCount":12,"integrity":"sha512-A+LV2PJmgwAUMfHAhyIUzpTNbYmo2ygezCPu4PHxEA+kvQbW6fsnXvE3MowF1nUBpoh5tqtSBXapJZ5HKRYmmQ==","signatures":[{"sig":"MEYCIQC6VJpmzs6/W4+16jTVp1RTnF+343vAYNr2KCkdDuU7YAIhAPPUbHzmFbu5q2SYYDAAkGFe2nIEH1pcNptQjH7akuB3","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":106229,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.4\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJfTZt5CRA9TVsSAnZWagAARIoP/2N7r2uPnaTywpY+bXe0\nvd4DW9yoJf33o/0l3Yz+ws/AfgZQ2gSRrA68SzWjcpa0YosgsMPCqVLS1xnX\njKvc/CVI9ADnnzeFIStvoE+yQEZDOx/JAwxm3TcgOtgvzQ47jp0KCYfbPonP\nUcZBWmnrwNX0fPDrpC5SDPwt1A+7x6f9CfwOzgf9VAZxLE3QOZ3OiW5ucOn4\n3wzcYnOT4o6dD6owgPD24lIIFYN3dAaPInKQDvIMLxZn7Gd3iZwhyVQFqDnM\nR433rapTLzAhh2OwfOdSoNQJ60MMGDYxnbrdjoFVJwSsmFdTh5IBXsFyZDiS\nM+sLPCoMV7t8YooKFvg+k7UNkA47k3fRs8QwWivUy1yV8nAsgp8B/LUSwiAl\nD+OrB+1F5CUE5zWCrmrwtN9tN9qFTvy9i2K1js8IdW5xSv4RfyGbgJ6Pu4bo\nb4OXzdhZkJCytEM75Pw8JNowQtbC8gtNUtBcOfblSGmQhQsgZ1qb03ctL4Ab\nEPASYm7SjLa06xaP0J8iesFH5GmzL6rWzKlzfRWLMLx+D8lEWnnQquDjEEPM\n1z9e38y5LrTZKWBIuLgrIoOhBYAsRq1OwSbdSYjdzkUy52llCFH1U8gn1T2K\nrFJMggVytcrnnsLQVS8JGqnKzN8+zE4VR954vpq9BRZi1oWrrrBnvWN/G+mT\nHdI3\r\n=qMKE\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/mergeConflictMain","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","browser":"./dist/browser/mergeConflictMain","engines":{"vscode":"^1.5.0"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","_hasShrinkwrap":false,"readmeFilename":"README.md","activationEvents":["*"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.98fe9425f2_1598921593229_0.3984342112955528","host":"s3://npm-registry-packages"}},"0.3.0-next.c7c6c5cde1":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.c7c6c5cde1","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.c7c6c5cde1","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"a7ed420131e42ecb7965e2976e1cf03c177cce22","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.c7c6c5cde1.tgz","fileCount":12,"integrity":"sha512-iSkVsHbOCha77NxSeeS6CFBGhQ32+QGcGgM/wDf1rVnEV4ypCe503S+g0W1XfeooZudxsKcq2foMnnLvRGx2Bw==","signatures":[{"sig":"MEUCIQCWizxH8ZkpJT3cAncy7KH8NqP8w2d8mf9woPtyBMEDlAIgEkXzTz/RG+PygWBA8M2fzW9Qgi+ikt5RYANvzvPY90c=","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":106229,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.4\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJfTuzSCRA9TVsSAnZWagAAx1MP/2qV0o32EZz9fXSJxE2O\nwChbaD0tsLIzJGLPvX5FVralFt+QzPF0Y+i2wQbo3PmlXxoT1VmPVXLpoWTc\nCkc+weOiLxCOTKTiDRWPlYBTr0IoA/kwONtrbbvdYWo4/2OtgYrNGE93BgjU\nn2MIIK/xeZmppQea/7mGM536lMPGnADDlMWE6Y4R5MumaLDnKxi17fkQD+ap\nQvfzfx9IA0uxe+MhzMfGIRCrHiNS889pKj4bf8oJTen3vscZ9kU1dwH/vuyh\nOrh9LBYuzUHxyDu60CSBLN5PAqpks0hw/fSFulhCAqxTlqrB3AYAs46QevV0\nZ2bDbHUAdiXEXMZrmo1HY2BYKq4adpUx9M0IU7MvVtMen1q/y0d19GWDRDqf\nno3wIcwjNfw8b2qSMuD2gDkCk9JtvbOwCmWwxCJ7O0YfZWk6n9wMwAoHroTO\ndMcB+tO2tnQy4nenNZNfUli23aB+TOXdhwEEtqUHKSm0NO9iiaH9f56V1vLV\n+WyMbV1MSBZ3B/tZpYTPPCbptwYh31dg61855lyfSrgtK7AdphVDoZ1MKZ7u\nBPqmPIQX4PCkbDxZr+6YtLPgf1+TDgx+VE91UiY+uaNxrN07Dx0ykxDujzD6\nrQ3Hk7XmLFuzhtgwNp6/B+SrGG4iooQRiNPmjefCN+QVi5itVDSGZlP3YWxi\nzjGc\r\n=mcNz\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/mergeConflictMain","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","browser":"./dist/browser/mergeConflictMain","engines":{"vscode":"^1.5.0"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","_hasShrinkwrap":false,"readmeFilename":"README.md","activationEvents":["*"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.c7c6c5cde1_1599007953784_0.898206546336173","host":"s3://npm-registry-packages"}},"0.3.0-next.7eaf220caf":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.7eaf220caf","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.7eaf220caf","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"0def15bfb2692bb7aa2340b849ef935e55791f4f","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.7eaf220caf.tgz","fileCount":12,"integrity":"sha512-dC2tVxxCOUAHihHJU4+TzKtzWgE5ikLTCM1CLKdVGtw5ZErvTkZveJlhaiK4XhW7p3hIMKbZK6okTxkjgmC29g==","signatures":[{"sig":"MEQCIBm5/Zf3argLiIwg8jcWfNVnROAsLIzoec8IQH6wclB6AiAlZWVcEPEj2iyXZYd43aEX3aGhG7X2uZP5dbHfs65FEg==","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":106229,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.4\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJfUD67CRA9TVsSAnZWagAAJ6sP+wU98hKxQPCJOMgLGj0y\nqpH6IjEHCTvP18whpv05K4nYm07GRMV5ECux8EA59XyA3xYDaCnAS3FdUDkw\nIffxdDSjdPxv7Qy5sQE3GAzqjG/ZmgwJOKhOu0v2W4lziqb7HBU03qwG7h0t\n6eH4Yk6XKL68A88CwuaLekNwT8XQXL/19yoQFNKU3YkCJo28PotICIlwZiu+\ns9Vppv/wupLyqvqFMgvbHVboa/OiLQdmXpQ5bPRQf193myvlmI4i2ShD/phS\nrwat7tSVjk63Ee8dX7k1uCNqzKt+bWQd/oHm2W30buWh7MWC19HkNuHb6hdR\nXw2g6MnXyLJehTTG9ZT509mai6nnYtn/2pNdp1x4F+9ScGl1lKzhtV+ky2Dx\ndUnBfCSWVnly2eYTuwp1AFhJQVihaIHOsGJ+svsTvJWIzwitHZb3Psz4bXNF\nOJPNzmM9xjRWXbqiStkIIF4p1Lb/KVG6JMb+rDLSktvgDGJBGKL6i/NJeK8G\n11D9bm5oaY0o296UdEeFarLyEd5ovR12m0iuTSveQTq9U46bDbA5pYhZtLYV\nbtlzmvNyj5KHlHRIbKY9NfrgGb4ac+K5dPu6q81/PWDhRZspQxmvr9W7XuQ+\nve6hIuwJ823KXKG632t7LKjr8+P/52H8VTK8qWHUP/HthFxn05/SErWBQndj\nXOPn\r\n=jsel\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/mergeConflictMain","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","browser":"./dist/browser/mergeConflictMain","engines":{"vscode":"^1.5.0"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","_hasShrinkwrap":false,"readmeFilename":"README.md","activationEvents":["*"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.7eaf220caf_1599094458712_0.7744174112972511","host":"s3://npm-registry-packages"}},"0.3.0-next.45c70c29e5":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.45c70c29e5","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.45c70c29e5","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"91ee2d421d27894d5ee63dc907f3a5a036d2ffd8","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.45c70c29e5.tgz","fileCount":12,"integrity":"sha512-DrR4NVle2v3ioOgy3/1PdY8BJ0RlV6tZbqYlQ0BhRdaLYpkwasy/0DWfp0oWlz2uWWkIFo55xm1q7SZP5IqeJw==","signatures":[{"sig":"MEUCIQDWpv4O7QtzZhFRDqTNtyN/AEs/0/dYV7NLNG7MEDRkRAIgVWBDSflL8PhCkWcjM8mGuimRmnvqjEnXoNi+g3nawzQ=","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":106229,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.4\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJfUZAQCRA9TVsSAnZWagAApQkQAIBQYJ8I9VgbAfOeqfPC\ntoTnkjze0kP3Fz9V2jnsrbP+Oydl0BJCzeiIB1QrL0pizHettihBRhpefViM\nQUuJ9NIn0ibvCZbyLoQlHxPl+h9RcEHkhRrm6KaFhymQmF/d+V3DkVmYJkbZ\nrTIIODftTqGkhEGhzutJnJuybSY60fdSngQcJVL3pIXr5rTXc+pFnZM02pgE\nVo2Pz5w3zD1WW+DD9NCnZ9JXlUXgjG2Ssd6mxGaO/O2SD91FbXnOEzsY0u00\nJ+5168eLUNL2fcwn3hP7TqY/NEHp0Lkc+LhAxPrLnckGRFBAw+pz2of6+enB\nFmYCT72Cx0eETzuRDyQZC3G3VtdPx7reFKppCoXFbMjmAvjwTNInZpxx98B8\nB4O3Cqm5aoALNBbLjBNu+b6yypSKeNr4hg4V+qeZ0SSa7YVY1465BiXT0FOq\nUkFSUlWm5OoNIKT6lIVouWDfdsRWAgW+yMk2qFEknFJ4sGVKNkUZm9IDLWxz\nhxtVQTJfj/j+XWlrWI5CuB9ZoTN08ltRKBKVUcTvyxtwqv47fImNRtGY6c1x\ngATceUgjASGO5U4JHU543EoOKyGPiy5PPNt3QhZ1VyThkuYnFCZ1C5MmXZXa\nVKlMHH4Z4P30oie5H6v3Z8PJPoi39M4NJ3ULWugSyeZC8NjFbAXJe8zFTmwe\n+jvJ\r\n=f+Aq\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/mergeConflictMain","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","browser":"./dist/browser/mergeConflictMain","engines":{"vscode":"^1.5.0"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","_hasShrinkwrap":false,"readmeFilename":"README.md","activationEvents":["*"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.45c70c29e5_1599180815739_0.12277242186275461","host":"s3://npm-registry-packages"}},"0.3.0-next.99f75760b5":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.99f75760b5","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.99f75760b5","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"02f0440f98228d0444ca38e3701ae94ecf245010","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.99f75760b5.tgz","fileCount":12,"integrity":"sha512-YR7XWH6qDEVzDvRSniNwLHnA5mGoyNL7UKAzr0endw5ewinEyDRb7DWoUS+meckpakgraKMkqhhkQVOLY+D7NA==","signatures":[{"sig":"MEYCIQCt2l2M7i07aSq/dP1X0uCXfVHCcQzKDDPIcImSi6g+YgIhAKpR8Yv2A7DP0lFxqVNUDSdLNtCE3A5PQFDlcLvYQ+AG","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":106229,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.4\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJfUugqCRA9TVsSAnZWagAAKvEQAJWbKkYgZzUNECr3WNd/\nShcOcr4o70EnBVU8Z1tQ4yKK61r1t132xA8MvGbipBOYpho9OOUYxFY5Ydt6\n8aQuNIfIhytOCQRo36S9SyoPEICj1roRI7uo80lFHEZ3Zq8wZJpFYQWvmMnE\n/S9XN/CtK+liVwsH9iLQa96fchXrizNexlsbR2ZXaLALWxUblau+8FmzaBbm\nK/wL9E5qkWUvF9PfF9JJE36kagae60BSf0ZcOikhy69EQ1SpGhuT13HaeiUx\nfvNWTLAkJ0Zw4guPeL9s619qa9VjlrsOpVZNxARft7Yw8p/6mc5qGcYSiyqa\np9p1EdnjIxtq383wC65ozzQPQDF89lcLYpZT0zyNJE3abFw3JPNbQLRnvxuh\nOubHuzrvcNCmi/ACQjI6yxZunS024ibaOE5DNA0naFj9ijApVH4snC3VuEKL\nfJvGTDaCIBvsnsYR5/Z5WyUkCMHzdgGGlTqBBuir4jTY/WL9OXi3A05NllNf\nqTkDZR7yrkiEYe5hiTlbf+0HkouTQzMYxs17mld8f4o2v+zDAdb5GUXbhnZl\n29/g1LV495/Y/e9El9QbRsxUL7KIHVw3cBKjvVAdivFSY2gke3sCfYOcWPGa\nLEeU645tVMihRy3ptOEEDtK0JJj49k2NCj+BWbao+EomAQgHUperCYoKtmbc\nFynA\r\n=s8DZ\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/mergeConflictMain","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","browser":"./dist/browser/mergeConflictMain","engines":{"vscode":"^1.5.0"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","_hasShrinkwrap":false,"readmeFilename":"README.md","activationEvents":["*"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.99f75760b5_1599268906315_0.9842344250127673","host":"s3://npm-registry-packages"}},"0.3.0-next.6c797984fb":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.6c797984fb","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.6c797984fb","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"5a0003f933ae44c1921cddb80aa379bd672071c1","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.6c797984fb.tgz","fileCount":12,"integrity":"sha512-gSiW39RiVmhqmy23guSIXz1xH658Zzkh5JkoFidzVftDFxUU3wr1gVU5RLK1w/3RJnvMgMeyvXjeRsqTOGiAZw==","signatures":[{"sig":"MEUCIQC0fjaB5HahchUw3NuDovaCfVPMQpGZYhy/RyrF9ZyXUAIgYIJAQl6SBllD5XcDfdxKvjTlvCMVSGFuHcT/DU9FREw=","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":106229,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.4\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJfVDN3CRA9TVsSAnZWagAAyFMP/RfVoUhM3/s9pFLAI+qr\nR5krfrxryupCMUgvEmg+eGRx6xWGbdYOqDnTL8Gk5BZtIQ+kN9B1xN79yRHK\nVP5aINKgeVF3uHJJB6ymvVw2tx/pbibLdpkgGNMsaJ9c5TL8NK44a+IEe/Jo\ndjCBT3wGWgrZg6pdcE53kVDyC8x7V2EzHR9wFriJTUCeOU79UeNfWBRcb3rc\nw5YN2UMXVl6lcNd3HPfKm2fsy/NaaCyiBAUy4joZYVh0mENWvcVW4txu2Yl1\nggzl4TpIE6NWyuKVMHg8/1p8Rz6SGgJu2Xy/kzRKFuXc55t0kNp/5kzyuIdP\n5v+VWtLS4hEYz+O8rOa1gpgAw9gFZosgOmTt/q3RKYXt6iyaMp2FoeQKL4w5\ngtzub8T2nJtAFDf+FeUEx3wZfn7gNAidpYf3Mgw9AwAD8yPk2JbZ70Cfy+Gg\ntafLaqHHlyS/kg6U1JNsElcGSeP04qmnBDnxGbxiKfnOOR7lGaumPaqzG45K\ny4vdPdn56FCIlG4ORzRnZY2NatOMTLdDbpd3XkYL1UZ+FnH+AeSXyH6rl1IV\nMIBS8QoGEwFj8R7teSzjOe+aQmc4820A7C9GGPYU3dEWeTTJx8lco3zjIPUg\n9vbeNsMVuvltyFFZLeYPKGkA2zOYtrF8vNxTv3utoEIszhLWUv4kOHpel0Y0\n9DLq\r\n=GaMk\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/mergeConflictMain","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","browser":"./dist/browser/mergeConflictMain","engines":{"vscode":"^1.5.0"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","_hasShrinkwrap":false,"readmeFilename":"README.md","activationEvents":["*"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.6c797984fb_1599353718890_0.3170924765540726","host":"s3://npm-registry-packages"}},"0.3.0-next.0d8cc5e56d":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.0d8cc5e56d","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.0d8cc5e56d","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"2170fe57f0e3a8a9b869a82ae0cb99c815bf97fa","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.0d8cc5e56d.tgz","fileCount":12,"integrity":"sha512-pdRGSS4Dn1jpE1+BfewSEr19De6IFOz10uiW/BCX/eD0j8a/EPbLaGR1MrzlCGF1a/Aw5bUVkRfR/IA58JBu+w==","signatures":[{"sig":"MEUCIQDrjW2YnDqOjh9/qApgRbLEj8m96b177S8TSWhlGO6bcAIgFtgJfN5xHro7a5sW4KgxBppu024NfqSD8CCCBR4k5ok=","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":106229,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.4\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJfVYT9CRA9TVsSAnZWagAA7yQQAJdRlPvmx1S7g6W3KjMC\nI5yY+cdnFr0Yg1u3MGeSq9DZ9A3SwDVcQEiUc5wxxDmmpan2ONuQixzKWv5l\nuKZEIcgdPlKYLwRgKMxxognXqPqBuDlJT/5RTImjIoF6owfTXrRF3IHQFP7i\nAhNtkoZMlrL6ajaxVRFdS8xynMM7T70oxC080YGRZXJ/q2HKOkvKhCttDP3F\nkxl7pF0pOLixk8TtPGyRM1iXStfPI8uOVL7sWnQM+6T87JnZL0eetumPBSR8\n66q+ZjkxXOYE+VLowyLjaU7erxfHaX/n5BVjxEE/h1jtzWDsmgMhOvyTsAmn\n/zAYZZYxngM8nF6LbR1mu++X5ygoMNvdj2d6G/Xl+mHPLr5ZJ55BsZoVsXSa\nvaH7RLnxUVvJM3KAIJmrHDwz3FOwzVGINWQ1wltkJzY2Sot8Ra8wFrOS3LMm\nIQ0vGnBizn09I/XsFB2qKcMxr1Gz77Keb9SRF2Y9D84uCqzKOUG18bBd7sGR\njYtn99coeFCYKtCPNrbUPvp6CUfkqA7z0YizeUb6LLQyFG/R+fKSics0V/yr\nouD7rzGHGG1tIKrgwWXBhiQt4hMEGJVD5nn72Lx5cEoyCwcP+Aj+8HXgLsFk\nFzg7bZrzGQfWCUuUNVCvoQZMVUDjfk6RCwr82FEd/z3xbRgxePbpAhP5LFrf\nzV1j\r\n=0NEJ\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/mergeConflictMain","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","browser":"./dist/browser/mergeConflictMain","engines":{"vscode":"^1.5.0"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","_hasShrinkwrap":false,"readmeFilename":"README.md","activationEvents":["*"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.0d8cc5e56d_1599440124776_0.8289157501014235","host":"s3://npm-registry-packages"}},"0.3.0-next.1d7b32b880":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.1d7b32b880","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.1d7b32b880","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"d3da92c96d817220265f610fa9310e631641ce60","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.1d7b32b880.tgz","fileCount":12,"integrity":"sha512-Pyd6vSMuuvU8D0l2ND4nRlR2o3n1tmvtcTym+4uyqtaQ4ICb4rIMzTUvZVyjCvN1gbDoQET6/e6SXi3MYCDPDA==","signatures":[{"sig":"MEYCIQCz+Lj7jSpDc3DWO82l8ht+sG1R/fuIAtZzZA+dg+q/rQIhAPXybE/UL+S2vMcC8uk2o3le70DCoCTNesVF/QAjSrEz","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":106229,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.4\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJfVtZfCRA9TVsSAnZWagAA81oP/iK9dC9YdswyzpJXFTVH\ngHv8rZJrY/fdMVh80qtXweJbSfWyWbZTJE+9uixCy4VKQUobAV0eAtCn4gw7\nfFhqnu/VXaZHFVsCOaFB9hLMzVaDg55ChM4F+kPC6y1UUzZeLpMRE7iD/1vM\n976babhwopJcHAP4E6H13Mw5Qab5vTYiu8elgcoss02qhsI/02mgo49eOiNX\n9EJCrWe3UiMPLsal9P/t4VRvSaJvReeWolAGBYb9z4sP62EX0MYxDOCLc02Y\npQJNhbVwwuzkvjxVBU0EDAO7POlz1PLCWxhnWGaw8/UPKnXQDa50pc2nCobw\nhxs8SDdyWq/DAvqBxQdg+Fb/mNJwKCn2a4wD/cATZKyHVpLcp8ek1K+T7PSQ\nwo8xmzzl1iRe4KYK39/JvPG/oYisifhtam292DTAHeAr936HnkCfVSgU4YOK\n+chtrLDv+/i9tGUcKyzchFG2kaA+jkWh58MNledKyG8VAeGJh9UYCNKtRXQU\nYa1GVZNpd8/UymwYcpOKf2lqwL19omBLOk2cISElFrm7p8aXh6/v8cL9cP92\nLxLu0AaSHsJQ8o7GbdDpaMReQXtsiIIIu2Vb0YaWXx0EkrnFjwOZMJ7VnBaH\nWllZVkSGAH6Hkj00pFm5LcIup6/FiBR7bpT1Lq32xi257Ue69470JuUuL02C\nUk9w\r\n=jTGR\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/mergeConflictMain","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","browser":"./dist/browser/mergeConflictMain","engines":{"vscode":"^1.5.0"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","_hasShrinkwrap":false,"readmeFilename":"README.md","activationEvents":["*"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.1d7b32b880_1599526495275_0.8770373930496429","host":"s3://npm-registry-packages"}},"0.3.0-next.f79540dc65":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.f79540dc65","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.f79540dc65","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"16d5ca163c47405e2d352798a46c4d26bf65bd0e","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.f79540dc65.tgz","fileCount":12,"integrity":"sha512-CvDEsg0dsQqfA2nmXSjTI4Bd5uFv+1x0pbdnUQkJZYVh+WMu2PqiqLB7tBSdWXoZSDyE0uLaSuGXILEDGg4O0w==","signatures":[{"sig":"MEYCIQDQX9x2EuKS+uqWv69tbu7g7caeUH25HRCDM1yQZBFcXgIhAOBFWEJSq9vzpNx5Ejrn8x8PyYcnMyOKtpeTJFle2L4Y","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":106229,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.4\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJfWCd9CRA9TVsSAnZWagAAiuIP/joYQLtZtkRC/Ri9mj1N\nU2N3XLff6pdRW0yPOCeJF7w+P8WBDSm4+vfushRfG4PiFon2YCfjkSwAB2nc\nse9hfuAAHfRU2cTyA4NGKR1W+XgamSEsDAJvTXPPc35woENM/g662/goQdw+\nNAZV68GlsOfrL8ahFetwqtOTeaoHTfTkzZ624l9+HpNxJyF9z/Z6QpokX62I\n8P1SFA7tTKZ8t/dZKP6Z9HD9mKmJ+KK5A1tNlhNK6Xr1G2hxvV87QZ01PJ/r\nfECtau9hzR1/a7T2lC4CkUFMKgA+DbPBQsSR3/uzH9iq1lf77yh+YiA39oCW\nTABkUFcw1h1K68nkwI6nxaMFm86KItpGJoGyzx932nB1GlFz3/hjT1kOopMj\nXOiDsGnXjjT/fYGHOZ61Vi2TDGakggbjFal0aeywRTLTIrIHuqEDZy/E/Yht\n/6VxzCYXkwoNVJbagBYY3TZpFlFRAiIxStgv+pEhxyLV2d2wLCKvOk7q/XxP\nWPfjWUBH8mthMvics/fobUgm3XdLGVQRzl10I2UL16lI9oAiqPdcvGCMpWYR\neBmCSGejmAChLwruavGth74L5TnvKwX65MDXkylTOLwMGfcrajJLRHt2p9c2\n8RCm9JiLLUP87NpMTg3HzgRS70Af2vaNuZWpxw1z/YY+tbB+NH1emOG9Ci5x\nd7Uq\r\n=KNO3\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/mergeConflictMain","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","browser":"./dist/browser/mergeConflictMain","engines":{"vscode":"^1.5.0"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","_hasShrinkwrap":false,"readmeFilename":"README.md","activationEvents":["*"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.f79540dc65_1599612797517_0.20526581441583125","host":"s3://npm-registry-packages"}},"0.3.0-next.03960a5aa1":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.03960a5aa1","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.03960a5aa1","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"1157613201e0fafa234298bca09f97f46cc45999","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.03960a5aa1.tgz","fileCount":12,"integrity":"sha512-fka3Ny8lyKM4WzwaCX03z21cwmN7RDZ9JpyaYdAw0nCIQDQsV2wnMlAlQbs2VGXrGpMN2RBssSc+2J1oY+cuZA==","signatures":[{"sig":"MEYCIQDkjpHXLm4f8ilA3m+cYVChX9cHeZhGsJKAVOn8Yttw8wIhAMjGZDW8PzwyaNMIPjF4E7jT69l40pXwQWZInjY63gvr","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":106229,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.4\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJfWXhFCRA9TVsSAnZWagAAG5QQAIgXWh1sIERBugNtni00\nPFggFkoR6GQqWHp/FHn6tVmgEZfV7YP2zedacmVYcCKvpBkBup5/+eE2waNS\nxfZoHHy2Wi8cgZWTu+8wx1C316earMFaDFv79CfpfxXUGD12vktmgBggcdBu\ny/c6KrwrB1Wsv5496rx1KNSQloTK/WoMc8v/LIlDbTzEIfwg4T6JlyW0aNQf\nw0AOhRxa/TI0ALVb7/ALt4fxleoM4EJ9b7aQ9OI22/Xu1UPVuvnvE9jnMsOK\n6Pyrvo2rKe6JBR5SdoiJGgX9s69q1XjOhRvRGZboJ6SAhCMNNmSo3i25lewC\nQujjpWUTNAHX49Gne5rUx+ChNEMnzhXkPsD5bUqZvKB7JXQ9mfh78G31oZOS\nMQzOtK4zfDluKhHZzF8sWtPwcU8Etqp9lOTmPmyfj30bMD6s2DKDatCDViLd\ndvlPfpLfkF6KVS10v9CeHZyfdjx5a/W/GFKHaF3T/ilGoFutQuq+4e5Cp8Xi\nnIHcImVgTTMPbCxeXgbKmiiKBGPHKrPXGmYv6h5ftseqcGGgrppYEdjxUj2F\nj0qoB3+GCWAUYEPXDMGHlngNtXcmW5tsRd2fcoBcyhz9V1TARDXc1zym9Rw0\n5h/CLmvol5RXFedsWn8Yz7g94douzROLiYezHPgudi9r0PU4NaAFm2UnYz7/\nKQFK\r\n=RR/M\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/mergeConflictMain","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","browser":"./dist/browser/mergeConflictMain","engines":{"vscode":"^1.5.0"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","_hasShrinkwrap":false,"readmeFilename":"README.md","activationEvents":["*"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.03960a5aa1_1599699013161_0.15119077959177707","host":"s3://npm-registry-packages"}},"0.3.0-next.ee11170fef":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.ee11170fef","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.ee11170fef","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"18ae523555fcbf215fae0373c685c88f5af28015","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.ee11170fef.tgz","fileCount":12,"integrity":"sha512-2UIj8ZTFzFAKqEEWua9U6BLs0G+fzohAfbEJXIhcm1UjDeRUF4L2d+NXbB+ige5DH6stBMCXfdhxpToF0m4RUg==","signatures":[{"sig":"MEQCIDk4K13o/tEJgcN7AoOSmDhzlgmOZlHlCNmCp4RCTCxnAiBI7OWDupSyZNpOZs9JVN7+MhsThR1uvC32KhXWJohDDw==","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":106229,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.4\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJfWsorCRA9TVsSAnZWagAAyZgP+wUKnFlrwC3tgbtDOl5L\nLA93OTbc9vFlFmlZ4ksqCgbh35VqCphdVnwKzmqaLMcfkLdOzjHCQbMb5ZBG\nV71hSHuMiJyxKl0NWpR7gxvWIrIwWHu9U+0mOEyUuSqUw3uaeb4p/wlT33pX\nH6O4dDDeJ7ZFU4zbNbTfFkEX3jDq/fF8lxImgwp3HHD7n/STRRLG3uczQ+fa\nvH7iTC6PxeKur0KWMdIdCRoq61dU8lH8H7Lu+OT//Sk7TTP1H+JLxsn8UORx\nGTE3D2FIpR5Yb4IisBj/Llc/sJFO8spExO3Xr0kqdRl9abUKX9DS8FU4XYZC\n9Mgl1rI5Uj3f7ll45hGFvpqGwwPyk9I3c9RLfMcJTgGa5/WfsCYdTdllUBJt\nH7aWLMNKHKs/v3xcOi84lFmYgKMkjUbrmxVSQPjgQ3fJeVuA+gpiDoa9XV3S\nB6J8FlEJrTFqyJ/BweJ6BuQBxaE3RBJ+dLakgckE+oduPZdFbm7/3T5lGzID\nHBUWEBfnkJRBtdv7wnjO1CWyShVMr+Oa+ByIvBynaV7SR/p4OH/g0a4FwbEF\nbUIwlyNgPxkHcXxKphcjfOYDETPW+H2kbdeypvvoI9Hk+ghyJajT5cQr6VHa\n1sIXP+zm7vhSt2uSrV2m16T0iUdHKk8cNTedUO8TummRICgjNaLOhUm2YqP0\npM12\r\n=RFbD\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/mergeConflictMain","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","browser":"./dist/browser/mergeConflictMain","engines":{"vscode":"^1.5.0"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","_hasShrinkwrap":false,"readmeFilename":"README.md","activationEvents":["*"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.ee11170fef_1599785514826_0.1743800247046443","host":"s3://npm-registry-packages"}},"0.3.0-next.cca20eba89":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.cca20eba89","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.cca20eba89","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"f7022e653a27e7a49af22ed145530cf484a57b6d","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.cca20eba89.tgz","fileCount":12,"integrity":"sha512-fIOb7Aadon9JWY8pLMpEIpqbC/qmDWlgJCg3Fe5a2aE1PapEWprkgIBkP+RBfGXiHdVDA2lcaxvfZAlZODHnZw==","signatures":[{"sig":"MEQCIFdc10T8QrmM1ovk9ft6MsITpBGY31Ai9H58+utaQGNrAiBgZec8nz1HJFrlVz5ZkvcF+hcBih+US/4shoDi/G5FVg==","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":106229,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.4\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJfXBtkCRA9TVsSAnZWagAA5dUP/i6Ot8BS8Hnzm5rpsda/\nGRMh+lk/CMd5PtkGGorJlTfhh9FUgN9HNMiKsuO0kofLy62n/dONP4ccuGqz\neJI/1SPW7kZ742ohc1E9mBmfvVsjBrd8VM2mgonKHkCqHP1v1jSWrOl4I+1o\n7v9Xh46uMe1OSzQSUf1sZL9J7kNdjsm462kXTfPhTZRMZmuDltY/Byt7Rkal\nEkdSlfPejXXOPB9XWhY74k/DH/J+pVoAJqqxDSWuaWVY5R4tsD/cHLvpKXuc\neeY9tNQZw9LmI3r9WLeARcrmsLahxO3ZSMfBeJcFxOf8W34vBAYvlxv9FDu5\n7nWR7ybzDEP2eguxxdmIy7nlNM2qPB6o6HpxakQjjYKeIil2eZgqocE5YCDw\n5iaU+kHwgYdwGUyP4MvyHfTKGBXwlUo1x3ItoKtCZqdLdrVNK56BfHA4hyTH\n4Bpt8bWrXP80Seg9ooj6RoNQrFXhzMU6BnJqzXlBu0/odb+h6aSiM0IR2QUX\niFuTeoEq728+AaP5bx+TbP7TtFMIu2XXiCXkWNs9it62YUW9nOXd2tniOax4\nQVFG1prn/ecTA9LwyW/KV0lwTgLkNbSKWgBEIn87sWWiPzZqNjBF3NNd1iXy\nDQXwT5/ms3r2LaNYBl3fwYLzEc+3B2bx4jyc9VsB2B1vimEAhfXzmBCR7QRP\n4/AT\r\n=pERw\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/mergeConflictMain","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","browser":"./dist/browser/mergeConflictMain","engines":{"vscode":"^1.5.0"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","_hasShrinkwrap":false,"readmeFilename":"README.md","activationEvents":["*"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.cca20eba89_1599871843857_0.8311290078843976","host":"s3://npm-registry-packages"}},"0.3.0-next.e13875b77c":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.e13875b77c","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.e13875b77c","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"7668f8a2df1d1d04155fdd862bee95a795454215","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.e13875b77c.tgz","fileCount":12,"integrity":"sha512-dtG6B+ajdPF2vpBBYJ+DDWE2543Bu/eDwy9Cr5TgsPXfLsE/IviTG02Oi6oyKVNf9+DCW/VaqbCAiE3xxoWJCw==","signatures":[{"sig":"MEQCIGPLQDwSx0OAEeNETMFqbncfWAIq8U22RRxFS64045atAiAPnNuiEVlRYRh4Xek7GX/+nmb58AMthEsQ++7Bi78IIw==","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":106229,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.4\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJfYBFcCRA9TVsSAnZWagAAJJIQAJczta2KbigJQeZNrPWe\nm/wvFuUiuuBR4MIKwN2LmDVOdC3fEok1E6B0yAEAyaV3cGlwkrQa9VNT5oKp\nJgWD7qsPlBBNYRXdVm8NVAwc4wWDlYsD8uzdCUG9wG1yariZ6x9a5dDtorSa\nD/VvDf/OXVe1eyJdy9P+3veonwCSnlMy8IGeVkrS4xjxYCmLJEKvLtB9BuwT\n+GzEJK7mFj60jTAdvkPj8UujpxgAE2SzlP/9PI3kJ4wf/yzWd2RsgzdcO+Cx\n4OCEoXwy5IA/pq69GxVevTj71IzMMxxwlwtWGr70UMm2DWH9joCoFuvbfEEr\neb7E3elvvZ/FH9jS0OViohpQFD6M116HRFi/ZLV4iZTQsI9RCyW3LcfLbs6V\nV6TP6G4WHL39WUvSITxIxayS8gG7EVV21Ls7RTb24KxvwbDkTPSjHMcFNp6C\nH69GsSKUqKong0xVAxFQEGd5NWuaNuKP9dojKas4Bh/rIIqDwSjDG88c9Xwk\nhJ8ZZ/SmZz6WYQcJug1gJerBTurPSEYSfoFBhLMTouTzNSJOuG64xtYLJnpe\nzd+r7kHIoIHpo7Yr8DFxOXs2GziUnVn1K2CfP3pJS+eWcFalctk4WrsD/dDp\nQn8nCTEHETz0P1qiO1hMoghPlaNbaKn7KiINq8enfaXOSr/2E4sf+SZga8b5\nso0h\r\n=bK8m\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/mergeConflictMain","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","browser":"./dist/browser/mergeConflictMain","engines":{"vscode":"^1.5.0"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","_hasShrinkwrap":false,"readmeFilename":"README.md","activationEvents":["*"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.e13875b77c_1600131420401_0.17753260285837102","host":"s3://npm-registry-packages"}},"0.3.0-next.b91c581dd9":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.b91c581dd9","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.b91c581dd9","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"f50ecc6a06223fdc05efd94a8e68f4ccd7132c70","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.b91c581dd9.tgz","fileCount":12,"integrity":"sha512-bfIWvbjySn2e7f4ywcrhYR1rRvoF3JcsAE4Dvb8vxzDnuDsiCcY6Kuw//wdXrSK2MJHNeeZuDCIDk3KRNqPXRg==","signatures":[{"sig":"MEQCIDjLXbEUEiHvsoujUCvKeTdZwKFCayxEI8cd3Y0fusfcAiAYeZp33gzmv0ZEqsspbeh2NqvJPsJ1HyHm3gP2rpNkhw==","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":106229,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.4\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJfYWJxCRA9TVsSAnZWagAAeycQAIxTVHSYP2I2Ki+5AwSA\nIRofSEhT7e+uAn6ThUsyD0okGIqNgYWPJQ7lOWmJo9hxRdQ2/KNXcKwtV8G1\nhUymK7vicxzqR78/J58DTp7oks1Byic1uuWE3x1F9WzycPzWScvjp888Wfft\nrs+l1/ba56t9NoCAGzdHGCilFlXCNOuyuLIIl+RueRblfvy9B01esG3At9L+\nC6edGh0RmnkVkM3PDBVgJ8xFhUHqAKAQlxxF3X5RfYRO6q7nKBpMJaYi/3ZU\nTo98HgKxagLFYM37N2MG79klqWRwv9jDa63nPfRqONbdjuaWLG9MhAyFIf2N\nUO32u2cQNeZ24brtdAhytr3yKz4/YEM2xpNon6sfa1JoKCNQlJZIii1oCHGf\nIxr1YsR7+VCUypqyz7SBbnvqPODQO93jY8XWNLhT9n/s70jPdR8GgaGmLYiw\npmy9hkjTwlsUThw92Iu1OWdyj4VNYMZAv7hC2NrKVd4A4faKQ3FtiB0I6hC8\nZWX8TFUbQQLkMdg6oszjmbNJiOolaRanFBbOt6p25MfzwfFJe0Hfe1TpwGP8\n5Bn2LGIU+CirXKOEQS8TYWvv42Er+UC2p1Ri5kYjOtZKX46v71clsIrUSPYe\nm0GET5OyFm1X7oj5MAnHwHn+k1RIIqvLH4koQ8TjC47zZDNpWBaV9tjFsWhg\nQZr+\r\n=Omfe\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/mergeConflictMain","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","browser":"./dist/browser/mergeConflictMain","engines":{"vscode":"^1.5.0"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","_hasShrinkwrap":false,"readmeFilename":"README.md","activationEvents":["*"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.b91c581dd9_1600217712327_0.09877413305153904","host":"s3://npm-registry-packages"}},"0.3.0-next.1343efabed":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.1343efabed","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.1343efabed","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"e1a3a7c6f04463239f6c110ddd4f0fa5bf255317","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.1343efabed.tgz","fileCount":12,"integrity":"sha512-iNOCYXswoFNS5X6fLyNpiwVv1BKMpDtDR89JpvNWJfaMhnWP4l9UrBSeZTNr+YJ5jp3HDENNzWryQJIut9x6kA==","signatures":[{"sig":"MEQCIETihIUkZ6HkqXwLC1IG4djzBk72Xy+lkPJrbxvFkdmBAiAZ3vrBGBDWONaivW5ii9bPs3CB+WC2W0c3F6eEKzJ1/w==","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":106246,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.4\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJfYrPZCRA9TVsSAnZWagAALKEP/jA4QSR6snfcAdFXC3Lt\nOUG0jnp8sfsMGrNaocdJb8EdzObuurPWD/08zqSv35hBiXytKVhihekbqx2V\nRHv4pK1N/vlyuvVFRx8JiPNTbKAdAB3t1XEK7nwLp9CpqOQoYm0tBslEZfuV\nsFreJU38wXLVQzi5j6mPaNXtwdhQ2pMrjnlVFa9iOHO+tjGUxvxYyHu9kLq3\nMN0XgllVlMOlYgpLuv99vxX+fggw9TjDnQ9XZ3ss8IKhiwLQwuDE2s4ugeOQ\nmWZ5wj9N31vx3ABv1lptw8f4sWMTHZkLNk/yf9HDpsk3KM6OYxB6DgXeSO2W\ncWY+44/VINM3YbShj2pKlITzHNPa/bo0qkNusNWKW+QCP2zc0hKYs0an6ctD\nSHEkbHuye1hiUMojVIKTbRqgyQ8PpwXbqfEZI4JFm/uwkCfIxsNAp8+ItiBY\nvv9e5B704QA8OzB4YpltCmcpnuxvUbNBiXrQNoN+cG4m5GxNjvDGgrhLjF56\nf4i0VgRxBo5ybGhSnT+GytRRb2oa18Mjh+YcS5GA42gLFjFs4VuVcFt2fKon\n2cZaRIkwbz49JMRWJypmEocNXbr0usWkNx6d3ZgiGp6G/khY20IHCcVODJMJ\n8sKnsg6DeUdO9BN/apo+Xq6HAHng26GoAcJ5PyLjDppKOcPANYAhUF3kJKWr\n3ZFY\r\n=km5s\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/mergeConflictMain","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","browser":"./dist/browser/mergeConflictMain","engines":{"vscode":"^1.5.0"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","_hasShrinkwrap":false,"readmeFilename":"README.md","activationEvents":["*"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.1343efabed_1600304088712_0.35889238511730115","host":"s3://npm-registry-packages"}},"0.3.0-next.e8572c0221":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.e8572c0221","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.e8572c0221","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"f587eee9ef21b0e60dfc469fd7e62350a335ee30","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.e8572c0221.tgz","fileCount":12,"integrity":"sha512-j0qcQ00YudQHQ80XT4G2FPmXKWR5tXPjEclGq/fdyvqkV/TTn/gY7VAPthOv5Cai0TGQHuQiUCMZTFZvdgGmIQ==","signatures":[{"sig":"MEUCIQDDLJX7Owz034NvytPeMi5RdSH2oae5ERb6ZeRbsNnNxAIgG6cxKtLwSPVLPzKmU+3gKioY76DYKrz1TWPjJGx3clc=","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":106246,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.4\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJfZVbyCRA9TVsSAnZWagAA0qIP/3dowUBvy1zr14r7BfJD\nJJP0UNQsUk+UzXFOgEx9ZjMujbmzcLw74Nmwi8ugN0SKrEp51n1d5qyreUJW\ngFo8W0yB45zG+ULLJ++LZVcLaBSLLZP2NaJbCZJU8caBQY+OgNcdtAjpaPJJ\nFpuPCnliLVZiStfFLVK83MDliTbt1/RkepHdfTvVvKHM7D0kLL6gx/39Yt0R\nZmAiJD0NZtcpYGGvOOH6llz2fpTcxjRuAgpy35FmJpVmOMA8sQdWs8Kd+Whq\nhOjzc1s+3sKrN9crrprjG0054w8vapqsmIAeq4+0WRvpAcvAXncoOHbVuTrw\nhDULTVDOS7pD0jAQq0xf/aBGmabZ7bIN9XG4jou8zoGO/ehDpTonF71FZyab\n4fS/zJ669Q3TWYLela8m8DkevF+Af29L596Q03pANQGfAoaynaoafLJd1+sa\nFO5VMjnCxAve8z1oHoWneSxsT5M5JUu3Xu82pGVS4BEl83U7XZR4MHU/KDRQ\nwrt48ZdFN2Ax6G4gqqxBMPTwsq6e5a/ehZat2Ei1CFqe2YM/n15ZBUTFKOEE\nWIMooMv4JNU5hh7XRKmioBpb844VD5Fl8sKd85cGtMIn1O/+qLhD5sZsDUfy\nXGZKSEJZ61rQbQI58sXpDqPd9Baco3SkCOQJi7JXNUjSqfG7tB7ihBek7OeJ\nzDyb\r\n=Hj/a\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/mergeConflictMain","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","browser":"./dist/browser/mergeConflictMain","engines":{"vscode":"^1.5.0"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","_hasShrinkwrap":false,"readmeFilename":"README.md","activationEvents":["*"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.e8572c0221_1600476914004_0.537821298688389","host":"s3://npm-registry-packages"}},"0.3.0-next.868ad44d0f":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.868ad44d0f","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.868ad44d0f","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"7b52ab07b7f27fa9da3cc0be7f3baa2b40bf6b88","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.868ad44d0f.tgz","fileCount":12,"integrity":"sha512-aY9k9qtCJKsg0qLdtEul4ZFu5k+TEUBRUelVBEQq70wpkYHAZ3aVcAlFkAjdID9GqQhs0CWtEb6edWId0X1HCw==","signatures":[{"sig":"MEUCIQDeVvKVDnKlhveUEvy3B3QgZRIB++OwNvnswtJmZaf7ggIgOaiDr4WUeIWGEOyRPmbLAuF9/awPaHVSnfc67DD5MA0=","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":106246,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.4\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJfZqjyCRA9TVsSAnZWagAAj3cP/j7phOMZ7KG8LBY1M4cb\nPRYGUvfPEk/swT9gzJ7yGIbtLRt7QDFOo9+L81fCqmKcZDHBiX05xi4Eep8S\nPdg+w5OfTcmG6kqt66gMaARcHHXr9V0pwhuOm+2UJDdEwO8+EXnDdb9+Bbni\nBFnNMm6GPqQ2OnM/L0pORusZAdAnkv38m4X9RVcRq0FvJXjRXiDgDz6UYFDs\nig+QYf0bXsYnN2evsLCGd8mI8l1BH78T1Gtk7uQ0BMGnbD/vlxVcGM098k6B\nWJIwd6YVIfb5wAS+I+TorJLvo80qBfL68BReUm/2/hxcFv8Uq9Sd+0W+JJRB\n8e4+VM7JxVRgGf0SgzOs5+bD2F1fdVr3zbWKdChiynAu0zBr3tFdfVQaZLT1\nW0lVDJGlzEVeei4Lv9sB/rmV31kIPGG7oTHwATImc5jQuysGi5s0Ps77s6bk\nmnsX1dyBnE4biAf44tOEz5/t3KK7buoO+rPYb+LJYxEwVhkXZeh6DYpbUkm2\n3r/cOndMaCy2BXARNUp8ZHQtDIqLPbHcAYPq/6Ehp/uirn/08Kj8B+kru2nG\ne738Y/m3qhYe8fz2YpH9rbBgN9QVYObTslkmAY0vCshJZ4dGsLBtRXjLImnD\njHDSoG68PSE5phb5p9h7GOKR1DwoJ7Qb93Z1uMKHmLQ0eG0zhdEXWJBmB9GM\nlIiD\r\n=fq0q\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/mergeConflictMain","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","browser":"./dist/browser/mergeConflictMain","engines":{"vscode":"^1.5.0"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","_hasShrinkwrap":false,"readmeFilename":"README.md","activationEvents":["*"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.868ad44d0f_1600563442515_0.9002612850985019","host":"s3://npm-registry-packages"}},"0.3.0-next.640385a875":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.640385a875","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.640385a875","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"fb4c995764987811b776bd0f672f708210a364d8","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.640385a875.tgz","fileCount":12,"integrity":"sha512-r+V9p1pQF+yQ4HWVB5gaeCReJk+e714kEHARO1PvFs/qPGuGSiynLZ7HClpgv1Hjn4ejbAc8/JwOVe10GkfbuQ==","signatures":[{"sig":"MEUCIQDzt0Z2qvM4jtGVNMwIgqfuPkXhbxP1DGIlyNKUgkvwXgIgLU5lTnQpstOKi20jTgILBTe98r3isQp03i+Z14SP25I=","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":106246,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.4\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJfZ/paCRA9TVsSAnZWagAAPjEP+wW+9o97Kpc4msZzWkwS\nOR/hALYWWhg3kXflcSX3Q3xwFicrO8GqBLtdjGgju5809AnWthUIPJ7PnrFP\nIug819dwE+FaD8Ti32f94lr4d4nkNIMo6U9CqKHbWqGc3EjSmZEEVPlpiY9l\nr3838B8ijbUr1DEbhdY9kgzlH801CJA8WpADnHDPVYkgf35+rnR8tDVjp5pu\ncReZsiLapR1iymjvgzccaQH0NZgPxbW5O7tfiFyQm+RhnysMmUblMeGRpxyL\nLAYhTnPCquB1NwO+q52NbhKoD6TKEtJV75FqRvOhfkS2dVZKV8RJ6JgM8fSn\nRgytDdCpoRebTGpwDmdFD4Atkf6lo2PcrdmsbM7mR0hoQ+QVq00uZ0Pm4YTd\nYPffE+vYorcVN5rroMYG+XIpId4ZCdeFbFqnQxhKaOpGAl/5fzic99saAVeI\nEboTOO21Sp6xVRGcxrwMBxKyBmRInUK1cXGJKOkspkuKFVwKpBUM5Em0Ic6h\nO0S9Dzemc8hRdvubFXYQ+kK9NEKTinYY3Czl3P8ZBSPjKjMj0wt/QnLJHaLr\n0CW3rECVVjsaTaN4l8S3tGDGZuMELkiXhQ0/Krg8a1t2JBPtKu4op8hMu7LR\nY9nX1zsoUxG+FTHqwgf8lqSP5jhqTpJ71phWmgcmqLT4turKmv9bQq1xq05W\nQA1q\r\n=b501\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/mergeConflictMain","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","browser":"./dist/browser/mergeConflictMain","engines":{"vscode":"^1.5.0"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","_hasShrinkwrap":false,"readmeFilename":"README.md","activationEvents":["*"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.640385a875_1600649818513_0.18970924416553214","host":"s3://npm-registry-packages"}},"0.3.0-next.677e4bcdc4":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.677e4bcdc4","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.677e4bcdc4","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"2439e159fb264f5adccab176b20a3f5d78c54e7d","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.677e4bcdc4.tgz","fileCount":12,"integrity":"sha512-RnGPnk2vH6jlmFpxI0sfo3dySc6D45BBfLW8JXz5HbKO6GyQA3NTQb2+NxIIednFUJsiMqE+dJw3VuhtXWup2g==","signatures":[{"sig":"MEUCIEPOY2drGehs2Mti/K7CC3WE3XAJdVhGxugBe7ENzLkvAiEAxx7PAS8/YBFBjRURFsBLwXSteR3TgNoYryxaYrGaOtY=","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":106246,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.13\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJfaUueCRA9TVsSAnZWagAAKowP/3uyZVZTNSUzjgqmxfGy\ny72vXZGuTh5Liv5YyOxuzcSwmZ5ybPxOFg1YJ3vDt15S4+OGzklSSc5LGJaS\n/E7lZupAp3Xm97VPsk5dK560aTkYOpiAspRBzRopUjWyeBm3byPoTGe4wOB5\nCLz6e8OgTi0fgTalnoqlOscvkDR+LpRycPmaeRVJi1FH7tWA3nsMIecnF9zM\nFlNYq0iNwTraiDW06iSSMB2HDPIu62wqCJYIcc6aC6q4aswgu+R53DE0qBSY\ng0okYZOdOiZbtu7OcQ5ty0isRzKwUBxE3vYhQB0u0Y3ZTlW5fN881H7cEdRx\nqpsxKEAMRsEEC5deU5X5cHuobfF+RWR+p/yQzgvbaSIATQxzRvziE0XLVzeg\nj+noYnpep8mabugWnlIZFeBWIvc58s82PIzQWuqMgafXJnBEfqv3QHTLpEkr\npRaNVwfSLHJ1M9ZLa9y60FZz53hNktVDLa5VR4YQB42rMAa6puTIwlYV7GMO\nQvwZC0H6vll/FkEdgNmcHKgmOM3Us96zVGD8INIhQSvdN05d3DL/OdmgBmwM\nKwBVhlzr5hBw+CP28QEmihqQitb17s/wgBIESu8w1q+ntwayi8zEbIAmasKY\nPRxQlf46P86YT/u3oxdy1unZB3C4GurqgYHHmv3WK3ZJ4HI850ltcyOPh3C8\ngHKZ\r\n=8bys\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/mergeConflictMain","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","browser":"./dist/browser/mergeConflictMain","engines":{"vscode":"^1.5.0"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","_hasShrinkwrap":false,"readmeFilename":"README.md","activationEvents":["*"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.677e4bcdc4_1600736158375_0.5376596519543484","host":"s3://npm-registry-packages"}},"0.3.0-next.8d056ce863":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.8d056ce863","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.8d056ce863","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"1a8c30581b9ff2e6b0b93c2e89c04120aa1aa998","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.8d056ce863.tgz","fileCount":12,"integrity":"sha512-X4L116oB6u2LjojQBPdynuU1jiyqYsmylgp/lwW42jVrKQElkfPBh7ntBidVIkPDyjMhqLVuDtGo3VecG7s5Ow==","signatures":[{"sig":"MEQCIEv2WodT9S7PF0CqlDFYajgXhS+4s/ju3dUj+eb/xjhEAiAHMuSWtUbyTwr0iCXn3UDWqz9GJPWr+qvxK2KBMOulvA==","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":106246,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.13\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJfap04CRA9TVsSAnZWagAAWg0QAJdDZaULGMA73SkmKz8J\nhonLwSY51+SpuulbUc40MhtR1LfyoW1L+WMrRIJyq8z9o6+xmwZ2rrC8jlWa\nqzJiDHWvYKrfvsZyDD/TW7JZV7NMo9O/3eVlfQ0TYT/gaqeXPi1/nJAmB8PY\npMW21E1Dke2VD2OYJOT+nMRJcaZ1GtEutE2mRf0+Dy7LRd80+7V3C+vsBwsz\nK2HN/RR/PInKMGiyiCUXdfKhYTeETjeiFqnTitehhZBSJNZYU9Y2neJjHRah\ncUDOfEufIICnwVRgYRXEtsjfUZjQvhmEqK3NERnZ6mlUxN2jKbX19UvUh1kd\ngQPAA+wrBzM7iJv2Z1IeRhuei0hkA1gsZ9XPLWhMOxMUtXurWuDNQDSJFts1\n4YdJSSpEqz3H6Nawz1p86Vp1PIncJyt9aweORNDsztiqhtynZ4Ym4HixobrN\nimFLWWL2Ax/94ms+yeHUooIQmr9HnAb+CAcnTajbIXtizq0UDptSW/A3bPFJ\n03OaqJXcU/5timKbh6hgAxsETcOaH8p7iBEtigLpjSJeQDuEFgEc8zmPdb43\n4DjcjVpy+Skk18KC9K+CTpFcPBWxhBjBa+g8YcGXgvLZYpIYR45pk/zhWILr\nfa/hKC/co8doushIiCGUhRl+R9XB49ZD4kJv2MMmUsaUPVjiSEu9gQg993Hl\nSXUJ\r\n=6C+e\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/mergeConflictMain","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","browser":"./dist/browser/mergeConflictMain","engines":{"vscode":"^1.5.0"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","_hasShrinkwrap":false,"readmeFilename":"README.md","activationEvents":["*"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.8d056ce863_1600822583564_0.08566716396211604","host":"s3://npm-registry-packages"}},"0.3.0-next.a1932df627":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.a1932df627","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.a1932df627","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"2f0eac104eb626535ed076600b924299e1625eac","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.a1932df627.tgz","fileCount":12,"integrity":"sha512-shkPeKD3dvX0g4UUl98g5OqJlYPSt2uXb5fp/HtFL9c+soxJFR+IqLnNGq+3dB+3IQnKf6+FLbM4RbE+9pLCmg==","signatures":[{"sig":"MEYCIQDsFXhixSdC/9kFOCmtCaT1SwaQy4KEQ6PxWhYWO428fwIhAMS2ylvI3FPIRMN7lMBo8KgSfMzJASD/sgmmIQ7tsi7Y","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":106246,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.13\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJfa+8qCRA9TVsSAnZWagAAa6EQAJObNRjdE/s37kSeyY+W\nX1fDAwGVAb2S3dQbaH8SZQQYKcTaGmNQ+WbVz3C2Apv7fw8lDetf6nKBDDdg\nJF18KaZi9lnVS3d/9qcVAMI4SwN/HXgYUsOds++K0+pvQ8sXvU+mCDLHkko3\nzUC5Um2qQNw23TXLZ3qOEubYOukN1tJYrwpsNUvgRC+S17123HB0yLBbgtQE\nYG6GjhnJ8jwxrrzeZ0CCuxbhJRidJ5QF1ap9qHka1pxeH+dBweVsLlafTjHu\nzYyI+lT83hwWBzxDBoeMZpDC9Pw8u22mDgyPiDiPLcVUqOwchOGA2kwmkxVJ\nsIcSurIsGnkST13J6ro70Ljzlawb9+O7yZZbN4rueCT9m6Hpe2n1OPX7sAnd\nIdkWrlcXisxl6UZ4dqefRlG9yqwmn856aKBGp/QdAU4JhlRrA0QsNdupP8Sw\nQx/F23zsEfx1lVtDjReRKQVt160D/KEq2uqLZvedQgFilzGShYCSFmXCKUGI\nnCctJI2N4WBNY+HpeDboipBmUBvYRrKxK5sQYtLfXtBA/74RvwfyxUZ8uN4r\njXvm6WwVXIGorNbpp0HQ/xO0AzIqVIbJvcJf+hwLDrx2K38EaZo9E67flILC\n1yE9GFITy2aIfHZwLM+yv+LsY6AdkMP+HfGkS/abWjf9FCFzxGZsbuB/A9+6\n5Qrq\r\n=+qga\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/mergeConflictMain","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","browser":"./dist/browser/mergeConflictMain","engines":{"vscode":"^1.5.0"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","_hasShrinkwrap":false,"readmeFilename":"README.md","activationEvents":["*"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.a1932df627_1600909098041_0.043913708384160755","host":"s3://npm-registry-packages"}},"0.3.0-next.ddc98c3f62":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.ddc98c3f62","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.ddc98c3f62","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"c4e750d07349c97ccaed09564bfbdd3d22320389","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.ddc98c3f62.tgz","fileCount":12,"integrity":"sha512-qd9Ena5cArfUwDg8/HWOBeDR+nKkVmBwiCjgOX2/vOfZZBTQbpsRSMB6uHwlyir9M/QhTVypOz+RKuSzdGM0hg==","signatures":[{"sig":"MEYCIQChL+yKxeUkBC8JLAjYDK+MZnvicB4jdbPK2doT1bMLGgIhAJ5v66waDQ+YgK2KGpyRp+9WQfJgLU6Ub0uufQQr4R44","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":106246,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.13\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJfbUA/CRA9TVsSAnZWagAAsVsP/RsvJPdvF0WMScWX6i0w\nCiYkUy4rd75RnImV8EaaEoZwc339bDSeuhdcOTOYq3wSeOGEHVtdnQwwnhty\nLZRkYTOyqnLxc8T22mJbvnF3Gju8Yly9C7G4QAjninwv6j7Mj/0O2hiIXi1q\nBupwfBGX1TZ4m3Zz+g36NcJ1cZLGiu2MkRe5XcKK0l90fcnxJrutvnrKToIU\nk9avSzN7+PQT2GPKETIpbh1KE4RdhkgcMykYbYBUUDZQEa1PxWfDUipd53xS\naMjOI7B1wXJtEsWKLf/E3GwQeck9YuCJsFhzC5looYi3cwJu7bcmZEpAB5/K\nZ7OOcHQK8jClyCBNVgcWqPViPoBwT+Yv+C5rKKkkud/yjDPgai9k6dTnyADU\nbTe6sY8eE+RIwH9Sn6e+5SDgvNU12+dT6GhLztIe7A/BGxlrFO7koqbqWkUr\n6QWyXTW0RV9oVjQZ4h3mOeL9l3bl816E9WGzJK50XMd+bIuCDWyYBOnbaRza\naon0C/d95D0fyILTIh0rJDPPT7z8Ny+3e0yToKZm/L7PyjztfelbBhtSoRFA\n3JqRPJB6aRfpw91gAFZZaBdH+Sw0njqeEKLgESm7dBLOyYZSQ0+kU75r3d1P\nIPPlvh39lkkZvI69yktRnHto6YH7mf3ckMIj7VLxwG0argMBbb9ribdTASc+\ndaKe\r\n=T0Rl\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/mergeConflictMain","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","browser":"./dist/browser/mergeConflictMain","engines":{"vscode":"^1.5.0"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","_hasShrinkwrap":false,"readmeFilename":"README.md","activationEvents":["*"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.ddc98c3f62_1600995391346_0.9061441301871727","host":"s3://npm-registry-packages"}},"0.3.0-next.5d73637a00":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.5d73637a00","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.5d73637a00","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"94285d7c227bf7b123a86a16412edc703dfa7272","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.5d73637a00.tgz","fileCount":12,"integrity":"sha512-tuz0seip5bvSeHD+j8yQHEVCAnGyn0j0ygl68v3aWc+qGGQRiMoWCR/hbMa/qQ2mJsBlA9pKAxtLQ8V5rPFhwA==","signatures":[{"sig":"MEYCIQCQ9dl8JKyaPKZqKRozRmT0L4unAg3CQu2Atv3wkuID/AIhANzug2m+5Rva2Q6sB12/yhVNA+EHpMoKl6Go+DylgK2i","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":106246,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.13\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJfbpIICRA9TVsSAnZWagAAGZ0P/0Mpk2fwnMcl+91cn+L0\njY8HGk6QVUdGDv8aXOK3/Mk1RAvppDPSi76jr0nek1+hruVTvKbOADtJEr9L\nIY4RLOdfGy9dzfJBHhejHDVsnq9yiePEiNrZbpDKPq0uNGFqYM+I+7wBCrXP\ns3c2f9h9PfF5KDJfIuWSsm4VncBM/b8p6kJwzaiqj6Enqr5PKrzTEo9bUJKT\nj7uDQRwjUbXHPE1VhG5hs2oW7BuYcLjAd6c5pwlqO4zdZ7A97z+PZ9v3ekZc\nInZNqh+rv6OC8gYTK1hQGI5vqFDT4zfqq0B4TaA1Uz+m9gDRV/ES0z2izDSh\n7NBqnz0LSs3Fejv9cuprPIhvprDuSRg9+kWpHNZvZ7detCnmOelibgl3gV0P\ni3+olHp5BGBVtb5G/toxKAL9WqNH5DwHlnAP9zlXa8ADXetVDZ4X8V/iDaVl\nX1SbKa+/0UMVdJb4rKx7jPfj6g+kLoXK6/vmgaBPXePzVHfPiecdoqljSOhh\nLaJjEtX0zolZoatbmt0VbB9sN5bhWLkOHxt7LEKvcuDQPZKiuunS1spNDtd0\n6JH3Zu8UXiqc0ulM0jkIMoaz39pXFHAoTtJrD91tsXeQaYXLSiWboZMQnZIh\nWDefbC+/JuPFaA8EtBSVp6c72ajI/Xua+3ZqE5bbqs+tEw1PETT+Hrg//VLW\nO204\r\n=5OHv\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/mergeConflictMain","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","browser":"./dist/browser/mergeConflictMain","engines":{"vscode":"^1.5.0"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","_hasShrinkwrap":false,"readmeFilename":"README.md","activationEvents":["*"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.5d73637a00_1601081863737_0.0015618016116274447","host":"s3://npm-registry-packages"}},"0.3.0-next.a9f87e7ca7":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.a9f87e7ca7","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.a9f87e7ca7","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"6a40120af879d06918f54e896afb77d294f3caad","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.a9f87e7ca7.tgz","fileCount":12,"integrity":"sha512-Lz6DFQy3s4AtSx7VrDENBNGeBtMf04WvsWLg0GlAFzhBK71fN6bWtJ7mXbjDADCMe29GU9hghk6g3inEsmedag==","signatures":[{"sig":"MEUCIAHEQip26BFi8les7Bm82js8K0b2HQdSgxJ9wQnZV78kAiEA/wFw1NDtfnOt8XWfOjXITTR1Wx1hs/uUKNXbIAB7WIk=","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":106246,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.13\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJfb+NACRA9TVsSAnZWagAA3zoP/1pBxyTMU5Xi6WOxcd4Q\nfztmnDf+MLDf/HMmhmBx5lH2Xie9o0Fqj3mEnaFpBY49mZoMy6gCAs6or/op\nXGiy4oWQ39djY0NgNy55FzJXtdnVx73ewNOOYi8cX4M3BMvcdU7dcckmTt5y\nk2fjhH3Gj6tcZdw2XSWJDDL1RaU1h5Wf38DVdU6I+YeziL2veVMDM6ydp61i\no+NZUt+ZB30e7F9GyEs8pbFUk8ZtjLAvwFPPoNYnd6l8lE5Km5B44hymuwTv\nHpa4eV53SLH5nkTZP8jawyYw4TqsXu78C6nxfGR4pnxSPkYii9SQZ72cbxIX\n+CTd1+9hRjgRqv0L68vqI64QpNVWDZ+fy1Z0DNwGlaElxpoe6sPZAR6bIJKe\nDTWiUW2rDdOAci+tZ2FkvScAA2RrFTCheSHukV4h8K9fgYWvsjAtOZYrtj28\nKYdfNlCvhvTSU1Kz8dvaMM1zBsAQzELB46hLIkfdK8NogRh5DyL6RNCUmNbO\nVOzazwtxdbG1QZZel/T8XmzADx4fUENC+tmbzOqtNUrQ7kN5TBx5j0zf3bd4\nss9BbUoDXwoYEBo2+c9DzShEH7vAFXau29Vj+wQJo/tN9CvtueaN6cCtjEjF\nnzajA8T275zHcB6S8wW9JJeFrn/ricy13eZNkfY3LEiXNiWEzj0ToqUaXNKW\nUEUA\r\n=mLve\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/mergeConflictMain","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","browser":"./dist/browser/mergeConflictMain","engines":{"vscode":"^1.5.0"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","_hasShrinkwrap":false,"readmeFilename":"README.md","activationEvents":["*"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.a9f87e7ca7_1601168192023_0.4699779146385894","host":"s3://npm-registry-packages"}},"0.3.0-next.772aa0723f":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.772aa0723f","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.772aa0723f","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"0078267042e825d9d68c25c6bc10979b09bed77e","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.772aa0723f.tgz","fileCount":12,"integrity":"sha512-CA/wrdRNgpUKwFZ3Es5rSHL+tKJI6LWsrrrRNRhj7USvpVHktJDxWWNnW58rfRUDcq83ag3K9cINBL4ic5kRVw==","signatures":[{"sig":"MEQCIBPfTiEoy1nzVU0o+4O7PgpQwAE2XIrfL83SjqKoMSsvAiBJulVbhWZqfXss3dAGKbnonR6MuGb297TswRkuvO52YQ==","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":106246,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.13\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJfcTWACRA9TVsSAnZWagAAz6MP/2gxnelCLkpGq+JZg2OW\nyBx0K2Q59BlKhwQeWgYc8g+1fQoZD428Q8ca4fxDEAMrPdsJHFBFCbA5Qprc\nl4/UVu8uhLbiAfU/PhyvjLdpI3Un5lhbNTYSg5vVECi98xsRcGPncXrmYTbZ\nlv1rJGJOvDLAMuRavhzcrf2E/Ghh83XUAy2mtFg3aAz9IuWlsWdbMfBWrL9B\nfGRxFvCPsam3GQuEj+2mbaqyFXvHTOfD2PzfjXarZzTu6Qi8R23u02JYg5jM\nVJ10WbuBmK3bNNIi7nNBu8PJOoQr6PFNkk7nPit5aN9HEWVoWRje7jMLWodU\nAI9M0x+1x+gjBsn9yVCkj7/QKzrM/CUYaj58pWO0lof0UzT86pNtXAsmcHgS\nT26rs1S0ELkf7uoMw3IpwmSBmy5ulVovyiXZ/A1AkBYK/eg8w8RtCAP4i0Z8\nP8JV9wWrSXMPz1P7hxOriF7unYwZio6Y0UvSJqcwg2kjkvq8LQ0jqJNYsVIm\n2byG7vjpe88mf7iU2FI5yToIW+FO0gYP8wjMlXfZ10D5oTCgT/+fEzOHcP5v\nwruIc25g4ue7SkIBm9LMmBEYa9e223lXW0TCclKkS3nrthVMqn86dpQKTfWS\nNooAX8ZnsL53uLapVLbf/KyZINT2Q8if5KnX1DN4qmqzIM7u/FXjptE1bJg8\noi9Y\r\n=w89P\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/mergeConflictMain","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","browser":"./dist/browser/mergeConflictMain","engines":{"vscode":"^1.5.0"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","_hasShrinkwrap":false,"readmeFilename":"README.md","activationEvents":["*"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.772aa0723f_1601254783901_0.067457762737821","host":"s3://npm-registry-packages"}},"0.3.0-next.b2e7c41d64":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.b2e7c41d64","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.b2e7c41d64","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"2234a91287b2c4e17e86776617c2b533e4eab29a","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.b2e7c41d64.tgz","fileCount":12,"integrity":"sha512-otRY+1LOg7TD/tk3dRouKCQ0wbknZYdvUAr3vJNyMZUeDDmjpvjvhF5uUYPjGNaHdjQWs99czcoOAs6tRMFZVg==","signatures":[{"sig":"MEYCIQDio2PyIGRjWiaRleAojlRiQN2twzh72L7D5uO9OBinpwIhAJI5SeOOPSnRztedZIPlswUReh0zhmkhms2I0E9Lpufq","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":106246,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.13\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJfcoaACRA9TVsSAnZWagAAYusP/iJeBVVcVGsmSosef0yG\nBQY6Lmwvx7h8CG0C4cuvhOc0N4hra0J9TMGMgULgebXrLZVKkofavUTrb1zP\nlaJ4X1x6BN5THCcHbH2nmRruNcaDbXcCafWXwEA60RgpSsFtwQiL4gcC/cjJ\nPHCFj4hz4YKdk7A9PuwjX35i9ATHfpsfE6nyYdcNl8iC1BYjc2kvLK1AG/MI\nscvP+gcoqrAqAeAjvneoXuklbhlO4LzIun3fsXB8CaXoKB7jioL1KuimpF/X\nOh8JWMh/Hcfcf0LK1cwydGltTDYBRIsAo5hs4PycFRxt5y2HZfNGWmkY5JmH\nR+0gw2jYATPhfIaZcLLeL9i/fjE4tXwUcKL9FPlzRfxLaywc1Stm8LZDb7/Y\nnN3LAM6xJWBu7d40jLzlIo1xw4ZBt1Qi+ytZZpR1gNY7fsQ90qiNBcW1lPSC\nXfXzCo2OHBw2byRELIakUvYrYfahv6aMTqzVLJH7Ec8FJf6RpbcCllpwlzzG\nrNX049kazvolPJzQsmTVYcJuDu1KwIhb+Sz+PWbMR1bubE/k00wtNtSjoX0e\nyNfKQuZUeUhoQo4ljIjkAjdVNNNJEL0/bshH+9Ny5v3QLf9IYIO1XOrpiJCx\nmo0ju3kbkXDScFyyDWdfST4xMB/Hb71oWy5Tp2daeMnFrqnrkmoiYYCvMxie\nB8QJ\r\n=GE59\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/mergeConflictMain","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","browser":"./dist/browser/mergeConflictMain","engines":{"vscode":"^1.5.0"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","_hasShrinkwrap":false,"readmeFilename":"README.md","activationEvents":["*"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.b2e7c41d64_1601341055887_0.32722478753620865","host":"s3://npm-registry-packages"}},"0.3.0-next.07589030eb":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.07589030eb","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.07589030eb","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"74762ffa085115f71248c50fa7bcbaf9389279ad","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.07589030eb.tgz","fileCount":12,"integrity":"sha512-zOpIl2A6zyj6B9gFaVMITiM2EGOgN30bjNfA4+wGzlOxTPB/tv2ZE391S9yZJEvLNpTcAvSHxiyiGeBftaKeAQ==","signatures":[{"sig":"MEQCIH5g1jZmy1V21/xdok+JcnvmonSAnP0xM2sZpRw2ucrpAiAB9246tjL5AFQhsH6j3Lb4Y+gXRPYxzIHPt8EhTh1NdQ==","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":106246,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.13\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJfc9dzCRA9TVsSAnZWagAAkEoP/ibslTpJ420LwiBcqrYi\n61V3Q3RnEL0cZi2KV+BRfIRU0XKmYnNSvnYF7Zy2qHLUfpItwbPxsne85Ob1\nVAxHszwFFCuIfnerABG3RlE29Gj0Ad6kfsLLqgXWrWIQ0AZaq8VvEXCCAym2\nKYvRGWISvqfminzq86vHVQOutcM7Ol5XDhVvNn4FFFJrkCdfA1qJijRp6xSG\nHGOzw8C/4rp2G+PKE+R4uAiWj/3jk50HGkzaJuX8gLMOWDLJZYhMv/dX8e0X\nCDz8s+FnL+SgGvj76rqIBwcG0+96nDPlFayJ+AIXxZTTzPHLJ34ZPdURrAyC\nrhs5HODS6WXzu4zJQ8MjsyeVVk3a7RCLYjiNUsEP46TbmDIQtDU1wb1w0LJG\ngp4yFKcDYcEDsb/Ap2hZzGZJLPa76K7frJV34iV4plUgEYnVgvFG46NTywl4\nhjBvqUDnAnjvk1Mnx0E6L1aq2jY3xkM9TaJagRPrNkyUcW8hUGpoaAixyA75\nHkiQsbHtNXrEksv08wHwmCnSanaUF5z6+olAJAm3dJsBM561i8+7IA74zq0h\nvVdqxLgu8aV5GC69XhtwdeOleUibSEYPmo/sBGyw5qrxpyg3c2XbDt8CmpY0\n9cVql/MOS7zMmxR8I10kpZ/dtsBW2Flzmq7p0cVoIlKJSVIHoBZkbYbTWhz2\nRT5T\r\n=nJFw\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/mergeConflictMain","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","browser":"./dist/browser/mergeConflictMain","engines":{"vscode":"^1.5.0"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","_hasShrinkwrap":false,"readmeFilename":"README.md","activationEvents":["*"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.07589030eb_1601427315127_0.27839538063117475","host":"s3://npm-registry-packages"}},"0.3.0-next.0fc9b25746":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.0fc9b25746","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.0fc9b25746","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"baef83dc09024ab6ea56a6241a76b05466c91e94","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.0fc9b25746.tgz","fileCount":12,"integrity":"sha512-uQ+PVaDHZTCCFgf7EOVxEZuMeyAmKlIZgRIppHQu+5j3svhZbSe5drIfp1CGxNfcCEiHmHVzKLoKpc+1Ye/dJg==","signatures":[{"sig":"MEUCIQDKIcsnnTn6Mk9pLUaskl/418lCJbZPU+nWlVaNAVnqTQIgYnHGCGV0QPrL/IfADgfmvY5WsUpR0p63mB1+OfYKvSo=","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":106246,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.13\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJfdSnqCRA9TVsSAnZWagAA7HUP/1XKzHCCmFfEIaelshk6\nnGWWK0YGL00OHFZg7PqbdjRqqAf723nJ/1xERSwxCW24e232MSfleX1vUtb4\n7u71d5zvfWOFj4ObCqNQd7JoLWAzUxRirgPONoID+aFO7GiLEWUOdXomDA+W\nV03MYlPyv2AusDwV4AHZaJ7+a0SL64DiyljTTq2mvOUnam6vmiI6Oa1cZ8t9\nx2xnVidEarOR8rrsQoqk4FpAwMnKRlgA1QORdmznN+gbMZ6Gmz/6/9mPSP//\nixpbB50xdW2jcjjJERXyyG5e6ssnsH4qQgEco8o3ifn4JQZ28fH3BXXrCT9c\nt2lT6LPn80eanySF2BvblkF9tES6KZPIb+mGIdN78+/2ruuKjK9SEV/O2c8U\n0vRDWEUy9Pt4LBeHJZlptAXW8HkqVBjsgDD3w46ywlFMIbW9Wv+C3CBYAhDE\ntfLU7UGnUXv/miV5Kgivvzl6qnIAFUJ+SH9Zj0GSX3YQVWZvXjAPdhhDFM6C\n0PGv7OsWWaMhJHlJYCbCEteu4pFeWVdxnetJoJ5OhKQEKRLuDptddBpgo8WQ\nhbZSPVGw5gWL4dzLyu2Iek7s8VTkq5dbnNxpi77wZL4cjJufxsLR5bDEL90j\n5X+hFMrZCaVDPf1pN81x7U2JG2I/+mwVVkKB8QXCaZrCG/xBHLfhWQMNSGsO\nJ4IS\r\n=IPRa\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/mergeConflictMain","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","browser":"./dist/browser/mergeConflictMain","engines":{"vscode":"^1.5.0"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","_hasShrinkwrap":false,"readmeFilename":"README.md","activationEvents":["*"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.0fc9b25746_1601513962082_0.40161187208700877","host":"s3://npm-registry-packages"}},"0.3.0-next.5052a7bc2e":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.5052a7bc2e","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.5052a7bc2e","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"cc911d245465a2986ab99657c582c252a58f6c93","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.5052a7bc2e.tgz","fileCount":12,"integrity":"sha512-emsBdhmQUbG8tn9917EJACFtPPmJ31hjt/ey+UfAcPKWk2YWD7xgmuRSzIpI7iqpdGRBGVeucTd0WfWEuQrvFg==","signatures":[{"sig":"MEYCIQCAyCEGQY407nCG/yap5J3rok3e8Ea/+jXTMaVAprxQKgIhAJItsd6y+53EoEJPEA18iXKTUvt0AmrPfkEPL4MdhBAA","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":106246,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.13\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJfdnsOCRA9TVsSAnZWagAAn6kP+gKZ/wQSC87klnbPHm+0\nA/1Rz0NhRZb4gCbh5AqoR5szzejKQa8HmSMM64t3S+IMkRV5H9Dd9Y796oje\ncKQ9acnBxuk5IKxqGqGMkvBGklybUt4QEQmGFrevufqfD74kyIhPM7JwoYD3\nt/4j6l+uF4j4aG54imBvvHlPsRT702C7mG9jc9IRkMNiyEeLqve2rjnq5/MJ\nRDMPC3k72d9pzhGnwMDKuvk+EaifP2MrfhAR/tJlHxXOegkPTqY1bbN5LACG\nacA1RWkbRVLEBAeZMkyJX62G3zQBBkmgSj1ce6P+4hjmEPAtDcVcc1/IGKdQ\nXVhAtAy5mJFRJqMh8F+XuVOTT7Z85uJaoWDgwmYC1kQ2uWv3+U9p/U9VbVcm\n2+Hlt1kOWysgMKs4se7z8DP0UwY0X66VfsDlkiIxpz5iTfeAP/dXcXf/E0s0\nHtXRD5rnCkHsG06yg+zQZBAATWgnlThatrv2RNJ35cjDGBWNnEpaHLvgMpNy\n2qDjUeMYFDZeSvP3vGlKzRRQrT9gzNgJUy+nsFebboCnE6cu2vZuJJVfrooC\nHFYDl3q2RVDvWTQS5hx42fjz3b5g9NS6SOy+mxKj8HdyNnNLkY5orp/MoVQd\nvVaJwdN5F+JFJKVZkbAbrWGmbXKt2yAUl97YPfXLpZVIoDsXlg93ModqQmDe\nW4tl\r\n=0Wi+\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/mergeConflictMain","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","browser":"./dist/browser/mergeConflictMain","engines":{"vscode":"^1.5.0"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","_hasShrinkwrap":false,"readmeFilename":"README.md","activationEvents":["*"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.5052a7bc2e_1601600269526_0.3304224183572624","host":"s3://npm-registry-packages"}},"0.3.0-next.70a31b6a02":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.70a31b6a02","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.70a31b6a02","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"e732d256e13eba211801ada63725c2e2ce55df53","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.70a31b6a02.tgz","fileCount":12,"integrity":"sha512-KIu0pR2+hdnM5StKPEsX2KmyrtdvFNw5ZI/cDFwJxb1qILrW1DSAZHGKRDaRVK4wgbv5Vgy1mfEhuovjnSmFGg==","signatures":[{"sig":"MEUCIQCdrDmD0GZE3l1wDQh8OPumGih6drzdrBY2xwJ3U+hklAIgKa9jA4ywg8fqM5yddgCJanOiQS8TtulkXyiAiyrRilU=","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":106246,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.13\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJfd8ybCRA9TVsSAnZWagAArc4QAIXM9pHWmf7sG6PKS5Bx\nZaGGn4WCP5Cy4NArG0LrEkUared8JswuAPQV5pRrp0ZX+RbKg4ljfvEwLnc0\ns0nwit2EfO4qtuVHcHHo+GZzuSPogjjAacCPRrj8c3FmAVDKPuSbEzFe5WeN\nh9JTXP6p9YRBoJlU7iW+7710Oa72f8O2G/tOAIGY44osdfal2GxmvPfj6fPM\nq+8ILgt5rUWp9+wIZC0EiEtn/GL6EzAfC2GeRC5QB0HjHueWG4EDTY0uHklJ\nx8YJCm9CvBkwfg2fH6iF0wl2pWQd/iEvBya3wnW01xOhZtEEtyLDC1QHSXoM\n44kgTiWal0vYZtr+il0gGW9Pj2Qdd1l+z7mFCismFff/U8ty4pbX/DtiErrj\nuthWF9qzl3yPkrwjWhD1yUx7AtarKEgddSF+rJtybWCm0ADQkShj3IWNTDyH\nHLHf/2BXNFw35S/Fu1chkom9uFaz/LKqCh4B0qPt/CQqNSbKBWbseoZtp2Hx\nNoUIsEm5/iFEUIgYfu9kFlKQJcnbEHnbmKxb4aUmlKlKs3bTotbK8hQmXKNr\nJmcpCyjhxaYmVhxwZ9SthPh5XhWXLYony+odV4fGFdW+qG+MKIevRSImRR0O\n7N1GE9KUOy4u4oGrwAanIf6xh/otuFpzvXdE5uyPph066MV2v3dzE1e7f1zN\naUDW\r\n=7HqW\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/mergeConflictMain","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","browser":"./dist/browser/mergeConflictMain","engines":{"vscode":"^1.5.0"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","_hasShrinkwrap":false,"readmeFilename":"README.md","activationEvents":["*"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.70a31b6a02_1601686682778_0.48783501363008486","host":"s3://npm-registry-packages"}},"0.3.0-next.ed426789c5":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.ed426789c5","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.ed426789c5","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"042664db652e7a05096e5ac4c619c16c7b3843c9","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.ed426789c5.tgz","fileCount":12,"integrity":"sha512-6muzKxB3ne4VE5jJvlyFv/1i9qQcXZvUGd3KmyCALm1zkTeeIYVc1Stq5CwXJqPqj78BYYZexTidfyLM3gL8xw==","signatures":[{"sig":"MEUCIQD3FPOeQDVHGOd8LXrjFc+r9sdKeAcW2rsf2MM5+F2JbQIgNzDFAOi12Oq/ctDUT3frD/dcpWy0ll7Vc7oCBiiZEXY=","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":106246,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.13\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJfeR6ACRA9TVsSAnZWagAAKVYQAIPuvCjJCozxB4qCLMIQ\nxmlkfyek5oEME8aVHRn0nAGC9/M9g0oj6+ly6cbalZLSw4EvRgFmj8+rDWlU\nQ47I881GiCSqKJes0t0zUOVnokHYbO/1SESVwjsKs3VMkMowfLtmxyMrZqae\ntJCTSoMgcsRe2+MJLL59pwF9/rmH0cgsokAhimcYPvpGtK6U8d7tWVwSOXXW\nt6vMBSpAfb8VYCf/TMuKX43LesieKcJwcELdMLpziJmqY436GIZMdmq6EB3+\n27EWDExE1f0taDAfVN1n7PJurH6hadBYayTZW5mlOAtfJIdRRhjEvc3PhDFi\n7mLxjqcOgt7MVgZSw2q81h8vYMUffy9qbt/fehSu6JMgHQ9xe783pTqGWqKh\nSV3lazIO0OwBtj7/uykqIX6A/dlPdpnysvCX9ooHGujQqfos9KUgI6i4oVYc\nyy1lci9dfPDKZFqSXY+mF0vFbS2Xys2vnjYUB6x9YmM5rnbZ9g9U79sCZ6rH\n6cWd8G9eza7/2IeatIlukeyDY5l90+sOGrCgIO6entu7em9Vbz8gFUcFq/xw\nOMAMdsDi7Fu6NuZ12TFaw+rwQV6ryfqez6uyP17kNFucUXvsBcpPHA6/O7Mn\nSEX/pDUzLP1kXdBmJJEBHrzNSTQDM2wYziaJOW7J0YJHQd5rFVtdmijRrOSf\n/V1e\r\n=Tg5t\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/mergeConflictMain","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","browser":"./dist/browser/mergeConflictMain","engines":{"vscode":"^1.5.0"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","_hasShrinkwrap":false,"readmeFilename":"README.md","activationEvents":["*"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.ed426789c5_1601773183880_0.64336528063819","host":"s3://npm-registry-packages"}},"0.3.0-next.c7c471bdde":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.c7c471bdde","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.c7c471bdde","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"5305d277bf8aead5892a9587697441354634d2f4","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.c7c471bdde.tgz","fileCount":12,"integrity":"sha512-ebmGrH/4wfoBwxZnOhsTy8sNDDzy7cgLJrPOqHWZKbE32lOdW3eKwxqTKjmmyGedcmDqWFp5ViEkein/tf0PPA==","signatures":[{"sig":"MEQCIDXl+0yivxISI7DAaeh2x3JeOaudBSinNp/JaNCvGDZUAiBdS+e/ryVqPCYVIhvmEMO8QZd/SYDNkApJM21GHSET+Q==","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":106246,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.13\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJfe8GTCRA9TVsSAnZWagAAozYP/32OzGDE+W2bNYrW2sk6\nxOQMZs39BlhrNZDMSclL6fU1N/TxFWIYQe7HKwHNsRrYfV8QDw6GPp1khzIC\nXE8nF26SY85+Hh5PUvi0GGfjhhvAYW1MR+AB2SdZ477LYfn6TZS7uFRyFsBN\n8V8nbsRC/HqVOZa0p8DM4CmfeWtqSAYBfDSaMhv3ni/CMB+/Rp0j+Swejs+q\nVZHPC0/1QDiZrbDyhfjq9Ar9Qy0Fyd86GkROMFdACBm8S5snFkGwalWlqAJV\not3ifOY/3e9KTwVVuPOkRovr9HV1WJiFCEUPI9OXoGvD10sz1HPv/jBV0aIY\n/O9B8w+rrKy5V+voeUlKM/Sc4DckeSpFBYtXNs01z/htlRvrqQErY1tNDAh7\n/VEDHyi24l/0Jw3/UhJSTnqtsTkeM/tdJquxi6unyZib36EMjjzMy9GIG19S\n8DzytHIzajYb7USAZUgqzUzk8sYuwWwqUhNYCdmlqnxhi6y77goaSv1LphzV\n61fhaM+6ewDGPiigqh+CsrPByBZT69ALewDTcT8VYpmK8k8vrt2KjEZjfPb0\noKSfMWgLhq1iZy42RpysEjfcdrAZ5f7zDNd3+W0sZPPec4fwKgSsWGFWSleQ\n3wmoLyVbkdIl8YN8p4qsKz7jcVEL/PSMZevkDNjz4lBUTMojqghQ27qM1vyy\n24Kt\r\n=q7HC\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/mergeConflictMain","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","browser":"./dist/browser/mergeConflictMain","engines":{"vscode":"^1.5.0"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","_hasShrinkwrap":false,"readmeFilename":"README.md","activationEvents":["*"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.c7c471bdde_1601946003141_0.6844733749799359","host":"s3://npm-registry-packages"}},"0.3.0-next.1f7ba28bde":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.1f7ba28bde","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.1f7ba28bde","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"ae8af8242e45664253050eec81bc5a42cdbc9367","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.1f7ba28bde.tgz","fileCount":12,"integrity":"sha512-DrNtzQmTZNOaMyDWNa8hERMfwSrPhCiHG0E/kYcGT4baCOC2IAO+t7tOVMngU9O5ZRClk+qmGMAsGjpXqXW3YQ==","signatures":[{"sig":"MEYCIQDD5MQ06bZj7j6/TvnmETMGY8JzDI4vTznoF1dblNQl8QIhALqYTmEbl53aoZSmA8ylQ5HjrmgQsRyBPR35tCBK/EXs","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":106246,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.13\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJffRLaCRA9TVsSAnZWagAAVkIQAIBGixn+u0vq7bNFEv7p\nuPgMpRJddA8gjt3mXgzty1cBWvBCuaK5pm+a+ab2nJPV/FQsFa4ywuRl7BVY\nImAdjrpO9UHQ4EKXrHXnsfL9b+ubp1BsqQ0TdphyBCWruHWJoosxgbl0ZnHI\nh1CGJdZtNfImHGLmUOplsdikQVI/13D6T79pL4/oCemjAF2Mh387p1f14YrG\njtM/+mohToH/E4FyJ5SGs9u9be2K2fU0ST/KLMz3MntYrJ+Vf2+e3dyUW1kU\nUlrbG5bZu0d0hUVu3Im9JUXgiSt6dNS1LFDvyJP9A+IiUBEwVa0txxPZIpsU\npdVPRcHnuGwwJAOD4AIDX2FceydRkL8Bo/hKEG7KiaEZZn/SToaGga17FYpR\njhZtCTPVcwk4jeMoushE2W5F49Kgky+vEJRlQUZtNQvEsmC/zAYVVRlp8o0U\nqwb+WTjUQsY7kkWxeRsQEY/QENhoTzRMqaYkjyCdUYMFzKYtRATakf4SB44t\nbUQfVpCPhvXpxr2g05P4jy9ElvUJlmLrGCcDsdPPkJhh60/AtoSBmB7f1/4N\nB0rf/GdacjsN2WMvEWreKDmyW1F3Qal3uvp4zJfpRL5wnieAmJCcgWMHa5tq\nkMruo6Ar21aSo76GrYdLJwmuVHZGeAXXhFuWe4BqgGlYlKqFZCUZpfZHP0gt\nMA9S\r\n=C8e3\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/mergeConflictMain","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","browser":"./dist/browser/mergeConflictMain","engines":{"vscode":"^1.5.0"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","_hasShrinkwrap":false,"readmeFilename":"README.md","activationEvents":["*"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.1f7ba28bde_1602032345700_0.636961552673547","host":"s3://npm-registry-packages"}},"0.3.0-next.7a0705650f":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.7a0705650f","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.7a0705650f","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"d7d33621f3eabfac3e6f2a7855646d15e65cfdd9","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.7a0705650f.tgz","fileCount":12,"integrity":"sha512-HAfEiQxr5JK13s6hCdL5AyH4RkwVDDNsMB05Ex/zX6mWRCaDIkFqpc5WS0UWdQ9aR0UFvO9uwAirfAU6aK7iOA==","signatures":[{"sig":"MEQCIBAPbR7yCtGNoK6YMS4Lf1j3RKmBgnkskST0NuopTSCSAiBIgw12Hqom4xw3wurBGn9zARisdY7b3/lyNyAvfIcN/w==","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":106246,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.13\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJffmMJCRA9TVsSAnZWagAAAQwQAJs3LqvccYhOR+2IIIUJ\nwC37icbGXHCp0YT3JRjePqs8OUo04Uhxh4YKGftBHmMciYvOnhIXrSU/jxKK\nfhcHjha11UoegxjfFZO8Z45KkdbhA4+IJ6OphclsX49ceRwCHu6un4SLLD75\n4DuySF7dlLNM0iIha4L0TxN/oFF79JVDxsK7kIjsk79ZWnLlNBKQfuIx6pgH\nBU2QC0KDkMetuc22RIl5fBAdVT7F7oKZyd3IuQD3CVn6GJXo37SjJcbRBApD\npr1+iMDwYU2Qis7Q4UafwulK/ofv9FbU28IiZPQmBKj4pW1EhdghTN/mJAB4\nZEi9Dh7SOFlyiUHkHioVvtO/oPYoElWHkpC2D4zRbILs93ZhOC7E2j5DKMXf\nL2+nXSqumPHfcv5hjHxLcRqwR1Ccf14G3nA4/IstMW1blvN7SldQVjHAgYXY\n8qAcW0PIU07DdG8z3olLDHNPsx23YDzeKAlPfh7c0PqMzQ2eRA9z02PlxAnA\nCVfXP5tq2wvUgf6LUnbA6UfXdVEg4UOSt7hto1nfv9Ctha4lbnyAROT4NzgV\nXjiUw0PvNdrF/GkcZXTs9IIVrdoGUGI4bqM1yAYDED8U32r5z/bACvkZ88hM\n/OjaHWcwJWpMIlH9VyloJGmsuWSDacDCShHMlnq063OsXl/aS9X66sTxVOvc\nUOy8\r\n=xDi7\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/mergeConflictMain","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","browser":"./dist/browser/mergeConflictMain","engines":{"vscode":"^1.5.0"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","_hasShrinkwrap":false,"readmeFilename":"README.md","activationEvents":["*"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.7a0705650f_1602118408747_0.22330937739542867","host":"s3://npm-registry-packages"}},"0.3.0-next.f5d3ba4d61":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.f5d3ba4d61","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.f5d3ba4d61","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"c87c3eb44886e971f0044ada87e5f41fe7bc15ee","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.f5d3ba4d61.tgz","fileCount":12,"integrity":"sha512-kfZCt1Y5JGnStCv5D3pGh/R9XCdXx25MXJdaeXaZ2LTYfEtEpPLYPU5BR5Rp+Goq1hHUuj9Eu1IV+AuYHhqW0g==","signatures":[{"sig":"MEUCIQCAeUtAAgmbt5OGTGV2X/qYWzE/cYo8UU5LHXcVe+kZ8AIgVKcr9D7Wk27/NXGqvbBU7w9C3DUT65j9xV8dnxGijc0=","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":106246,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.13\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJff7WMCRA9TVsSAnZWagAAunQP/R1hNVY5dgD9LZokP5Dy\nnigN7bDXeDRT/JS42AKEMmMbzM56GJ7NDa3nLJU7+1W8bwkBThmgW8bAg/YC\nrCZoTsb8owGyNr3Nicm16Wi2zWAZsPtKX7CoU0xizzf8Ia4vz56GA31a2mZn\nycX/22cGzMfdiWZ9ODE1zKGAyw1QID8Pfg4HB1LrVKBMvWAOzpLgSINfms3P\n1r9qd9DyIavbte0IPt2xwU2zPF5wBWtlLs8iVVYCJ2ykq3yiwZkJIjrWoRTU\nTym81IcZlVLkFLViRDro8hCzL20UEfK8yBKsbMmqPpe/RhjQpcr38PUxc9nV\nlEADlaMdeEluOCPfEnPYzMGSpMBYnQl2J8KPN7pMCM5a9/4qMKyBeNZgBECo\nZ/rq6ppg1BF3xnJuB+pzvRRy7VowVToLmiLW2F2uCxvC0YavP+CaUgPwOQpR\nLtiohkmtdFwe9bK/KOL++X1D7CK4I8kOSaLHtiumAwt4l2Rwz71XQ/ZERgSb\nAKFnKSXp3G7JAaa9KXBH53U5Fo6sfRA43BbJsSUp+/0/cdWY7OCMxkPxIcCD\ntKx8SluxXtenihRZfrZCqQm0oU3K/N/9PeZBmRAMQkWDqTMwmSkn4SThMdI1\nJVnutMO2oG1yQyI4HYIT6OQBkqm0b7tANm3MGnPD38OpDEIafD1vgYOV3OND\n7lt2\r\n=NbSm\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/mergeConflictMain","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","browser":"./dist/browser/mergeConflictMain","engines":{"vscode":"^1.5.0"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","_hasShrinkwrap":false,"readmeFilename":"README.md","activationEvents":["*"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.f5d3ba4d61_1602205068254_0.9499834951156612","host":"s3://npm-registry-packages"}},"0.3.0-next.78db6d0154":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.78db6d0154","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.78db6d0154","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"34f272941691b0ae9aaf9363bc21dbe95c08de36","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.78db6d0154.tgz","fileCount":12,"integrity":"sha512-iYreLVX09E+iZvIsTiOHA3yYWqQ9/gHI7y/qsZuOH+43HEqgQcM5jrNKsEherhD+7IcMyye/eu5PjVhjB1dozg==","signatures":[{"sig":"MEUCIQDX2pvvmJcapfLsQ570gTRJkyqcEN04htrXsmfqAmulOQIgZKItqKuqfSE01/jsTyRZudGIT/jfRkIXtDHZo3HzVcc=","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":106246,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.13\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJfgll8CRA9TVsSAnZWagAA784P/20vHPxfJjtrazYMF0xA\ngBZ4CzKYuUKQRytILyNg/KDvcOQ6D+AUX88jM0ku3Yd60x0Y5k30FSfLffuI\n08LMzcH5Or3ypqZrV6KZzK1mOujXM1USw8A6f0vJR04biGay/JDfrgu/bjsy\nrc0SgURMSeOfqRdGj+9+94fFcBIK7AoQ2ReVHEzmifoQHIPa6RH4k2DftThC\ngKlXXzJkJER9gCjT5GkLjipPP+MHP5sUoiea6C47HdxcvPNCBlSnQOCBDHDo\nIx+bpsnkGUCKARtxWxZRhjLcuVga5dIZw3lt5VN1YZ9uEXPDhxnZXyyJqplZ\n7jZqAbjcLe0WanwPcDRp/c3kv+k09YhUXNBm0ocYsUutO+UOm1nc5IeGeKOj\ns+ywOw1mFVSSw9d6KwWvi1o555tc78juF4S5sshhq2YxDqjY0Jr9pProK2/V\ngU0GLHoRtD35oSMqdumqQmjpFpwr7e4fbQ6oTpStTgaEHKsmX3pwoZLznXbe\nZRn2acqbosiWl1AJzr/b1VmERDDLhsxWNddp950e+tJQCQwVwEeJBUEaHGz/\nT937hwFLlP3oRxJ5D+wTZiNZ0I1SXqJO7AJFbXdTdBBdSY3ij+NqcxgefKiE\n0WHhDUYQjHghGsTFdHB5UoHBcjtG5NV94eVsMHRfEB3RLq1DgWo5IljXFII3\ncRwn\r\n=bp2D\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/mergeConflictMain","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","browser":"./dist/browser/mergeConflictMain","engines":{"vscode":"^1.5.0"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","_hasShrinkwrap":false,"readmeFilename":"README.md","activationEvents":["*"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.78db6d0154_1602378108239_0.12136932360001551","host":"s3://npm-registry-packages"}},"0.3.0-next.c0d465ce1c":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.c0d465ce1c","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.c0d465ce1c","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"cc0ef05324871419c7e7b6cf63f963ee9eb2e517","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.c0d465ce1c.tgz","fileCount":12,"integrity":"sha512-3IOVl+15nkLcH0HUdT1xl/vKJK/kyvuoxjXRP2z95/9RvyzqldS/7CZ48shRAUjtnxbqKf25z9Ru5b4ehRt40Q==","signatures":[{"sig":"MEUCIAHuNLY5oBhOeog81GiiDtghVL1sH4zR3G0ei3aVGb4CAiEAn23q8wdCRBZrC/mlJfTjZfESozvb55YWIZG3yyJR5JE=","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":106246,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.13\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJfhPyeCRA9TVsSAnZWagAAsr0P/13NuLou7Ohkacgnc7th\n/dcNaBR4H2TdfH1FZeM210yEu3oFkpU59ayHabiVFTNquuclFFqQ7fScoR7V\nwUmqzfWc4bfNxnrt7cG9ZaX+6TF2L0oQ+fSubWIRA3VqNh+0PgxfRtYUr42N\nLK2kpT8/OhsGbEHaKw/OQfE3fHWoZ+3cP6CHvhGnVocYHHqaD5Nv0rgOhfjT\nMsoLgYhrgfR5S92CHIWMyFjKjXwrAEVO+7EIc7fep8CAXnEhw1D6qDvD9xW5\n86W9xZtNHc7Xil+QuRbDB95VhCz+qD67dj3hi49pISEGZMsNk8VEQxwvROUk\nJooQFB/fQROxo3zFF1/imLvVLGMt0WqrC/J2PkZWBjeta3PrpwOqYHAKbpxA\ngY78nyyo67prLEC/B1zWKdzBrahpwTc9ykPIFch60FhKlXRTuHZaZgJCTXjm\nmE79dFYMYEElF4OHL/ld7tNpJDF6aHHZKKq2Bhr8gYR4CwF5O1PJuRZNFTcy\nfszd9zpUrCdCvE/tnBynwIFSoBXij3YCFgz8Fh4yHWl/xM76/Z5AqUGm/cR4\nnP9KNiHVplwVjFaRXOReo2NwxgnTI31Ega/1eUzZT+nkEA61zU3boxQ+Xn/M\nQtqX/Zvw5SjmfELLwIJyt7A66fXQM4wQasCb1gEAmqUBEJJo9GUFVZ+O6iNl\nMWN9\r\n=NBk6\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/mergeConflictMain","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","browser":"./dist/browser/mergeConflictMain","engines":{"vscode":"^1.5.0"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","_hasShrinkwrap":false,"readmeFilename":"README.md","activationEvents":["*"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.c0d465ce1c_1602550942338_0.09392629763053661","host":"s3://npm-registry-packages"}},"0.3.0-next.de18f21e99":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.de18f21e99","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.de18f21e99","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"d53c52946894e8b95818a72f1348f894a594cf90","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.de18f21e99.tgz","fileCount":12,"integrity":"sha512-HONDdkyke25gfHYNMrIHSbUDXwFQwuG2DMfh7u0KB5iZNrNS9qUW5W8jg6akvSYbtrDbv711Lny/vBglBHvtWw==","signatures":[{"sig":"MEUCIGTJfdYixXLHUq+wFeD9sh52SjiMlOjJbDpqumt6XL+RAiEAq5m+4c0jAc+cM9R/yx0ecEECK4R8Y6rw+gPuRN67xhg=","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":106246,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.13\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJfhk3PCRA9TVsSAnZWagAAp2MP+QE0wE1qDDju52+F6Ltg\nZTTf8uWVOIv8nlV205yjlNjwPs/mD6OV2l2t5Oij+Gc2SJ+j3eP1pGOE7mrj\nylqwPGNxxHviRBfts2o9QVEupb9lGzrJUiTCj7N3AgWOV3FraFC1ZekJ+bHm\nH0uxCpJrfbSSJUs3izClQ0TVppDhfFJatvs021grMhKoM48Q7Iw3m8HImX49\nBcfjSVAO1jFc8tKHS1jvQKYmTBAxnj8xY8kGyWQZWOzICP2OX44+SN/QiMPx\nkt55I4KMt4ctRIoRm+xtQIgNamMerVCzRRykeJXItn3R9X4s+J42r2yTpen/\nzLdRuDf27JCuT1oD61Ieov+WWlleFVDOZkuysYe/z2LvpXpBmLxMOUmnyIcq\nOhsuDqtlt68jojGuTuDWZ3gWWOZzR44rOztTCz+FKBvJZTDbcy+iFLuOs25a\nxW78vQ/KPrFRZdKttQdyz+M/CCA6+GsfUlNcMK0WxC3BxfU6hKRmK6qx5fvI\neEUr5wIB5DtAN5mxY4tcj2WWHR299+Q2uGeM3ECI1JgcgGPekmyvDGaSX4Wm\ntn8X7IVcw5lFAP/QX8ubYb/ZXfBRzM/skk2AE8A6NXlenFTvNZwP36033rUm\n2d81Solp1U/thP4QKs76YL/SD6XQ86SRAaumSrYE/6C2scGqVsv+6JWwlJBu\nmc0/\r\n=6wfu\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/mergeConflictMain","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","browser":"./dist/browser/mergeConflictMain","engines":{"vscode":"^1.5.0"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","_hasShrinkwrap":false,"readmeFilename":"README.md","activationEvents":["*"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.de18f21e99_1602637263170_0.29866978284135004","host":"s3://npm-registry-packages"}},"0.3.0-next.8397461b70":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.8397461b70","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.8397461b70","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"4cbeafceed8fb2a767df8653d3dc2ed04d70ebb6","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.8397461b70.tgz","fileCount":12,"integrity":"sha512-yCaJKlmVgwJQH0bmoviTu7C3r1DKix/SsHfKtJCPI9M6O5CdSmZ1k6OVSQWtjAZUqnvio49WazYSZmvFegBBDA==","signatures":[{"sig":"MEQCIFr5PxveuUsGVi1PlrgPwtjamYvWL4yHYlv+pWwIYozsAiBFlfxqPVJF9RREe+qkrZZ9oLOFSUh6tlfsCIW9A41CUw==","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":106246,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.13\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJfh59xCRA9TVsSAnZWagAAgwIP/1odB1xBjyrkMWYjwasO\nCxJENWz5+u5vrzTeqYEvCuH7QZrK+25nzqsg29WyUOtyjmEtaLgESueYB8XA\nAr3jkwR2XvPsm/wvoXzBGViG3nxmqbdO+p0ikjhvqfW9IF6Dq9+KC5M8LThy\ngTL5Qya+mCe4BdVGi+CjslXGriFEdAqHRh44URiFw+Tfk0il7T9pAj6wKhHX\numkiz7AigvOAt+1+TpTV+krUmgHhZ2l8rzQeraWsuZsGO8w1DULj2MksZrPz\n+HRDvpyTEzpqIcEBM5ZLkUWF11WkZFCeL6m+KRf/gPq7LP2QgDygAeHKs3ys\nX8gUeAsxgSPescyqlodYXi8T10uJE9sxqDUMCd/MA71aNlLXEWkFkVRbkH+b\ncTEXQ+F9QSOaDM0/98TDD9UQGRbwIdvAPSI5hc7cZ79GXp3PLmpl555z3VeV\nnttjHD6ZkdaDyN7Rkrc7SJ5JhEplj8BQPvnDBX28hOTHxw6z7VUBPSzsRmIl\nNMqI31LXqp5ayU+s9eXvuKHH1mNC1PArKITKSzZGtfR0uyXWBFNH1kXCXVGG\nTy6Vc3WlNFg07C17e1H7EfIFYb43fPYSLo5Xw2BEuvhx7lWFQhYyM2/E0Wto\nHg9i0KA0GheGXwX6xZOlO2/eLGHsjNvEm28nBRVlsLUdEZpFbVHrWUzjNLTd\n3KPo\r\n=QQSJ\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/mergeConflictMain","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","browser":"./dist/browser/mergeConflictMain","engines":{"vscode":"^1.5.0"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","_hasShrinkwrap":false,"readmeFilename":"README.md","activationEvents":["*"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.8397461b70_1602723696862_0.5026376423748524","host":"s3://npm-registry-packages"}},"0.3.0-next.89c002ab02":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.89c002ab02","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.89c002ab02","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"af882dfb0c4c4ecea9cdb30138eb88f868bbfe6d","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.89c002ab02.tgz","fileCount":12,"integrity":"sha512-1MqtyLm7zJzFxNaf6Fm+jIwusHhjpj7rscXuwGqx0L53HgJ2+WQrqp25xMJD1yPUzeZEHKQJq/zyNcJRQH1L4Q==","signatures":[{"sig":"MEYCIQDsrhKAHs0Sl+luBpKr5ENxxj8tkCtmKUIYr7/YbcmO2wIhANFx7V74sgEnQSWL/RC2EOieqCA58wIXcq1CHsdXzURi","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":106246,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.13\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJfiPFJCRA9TVsSAnZWagAAUdkQAIsyAi2Xklf1MRVfKm7p\nt6z0FNfsY5wM3T+HuioD0gYNQSwkaXFhYkhQ71TjzOhv1wsGdvB9DW6LRY0X\nBzfLO3SAcnUHrwrpxheDWf61Gmkxd7htxMat/6AFY0vqeo3O1hBWgTkeqN6Y\nPIWbM4j0wrMp5FaeZKbMzymeX513mPIjwMKJu3Xe43RZ2cGINSOyivGnJaGK\neibOIhh0xi1FmRi5KDbZGgvgOHz/aYr8tC3zScagk3bo69yVLjYzLLPY6Aez\nsY8dxPsuFZBr56MVq4rvsBEa6Kpu1Aht3Q6bG+x+Z10SaGK6vAi5M6KUoI55\nYhL+dkDlDS69jeoqgp+TYMjzeVGricY4yykehbHQ7+c92PWjPu322wqmTIbE\nVsBkNBxf+dtjq6oy0itNc4/sMsLE/ZGKfm21698IDrrvcgp8AKQG6zBipBF4\ny9PnBnUhKY3gc51Zn1pOIeSipxzmCnYW3xtDbywRlwEQoVpFdGnQq6pB8FjV\nHGt3IG274GSPXOuJ+jY4Pv8DWGppfaJPe9nS0sR8Oy4mr5aX+N+6NPKN3irg\nOKD6V4S5etzFnoSuC4Pra38nHqHsNDvnEmFZ6yAKHi5mo8lvqJvyM+zKLGhA\n/nodo90U5jXoVEX9vkQP3j+5n/NdjORX3YLx7jK2AfJptU4e4YHu3fOyjvVt\nV6hw\r\n=qYZH\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/mergeConflictMain","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","browser":"./dist/browser/mergeConflictMain","engines":{"vscode":"^1.5.0"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","_hasShrinkwrap":false,"readmeFilename":"README.md","activationEvents":["*"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.89c002ab02_1602810185239_0.3002478721220134","host":"s3://npm-registry-packages"}},"0.3.0-next.c13678f258":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.c13678f258","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.c13678f258","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"27a8c90aa893772cd9d86e907e5ba96681d419fc","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.c13678f258.tgz","fileCount":12,"integrity":"sha512-oPSG8f+V6H85OTyitpZ+81BmJdL63G4O4gmpvicH2ODRQr33DSfdVYEUo5DQHA6ae8n2E/juNrwWgKjTDGGK3g==","signatures":[{"sig":"MEYCIQDITuF0wu0HIulpSuOeYoS9cy2jqj2D+NCUOZsfhaWSKwIhANhIemxR3Svh66+Lb45xoKjTIGClC4s5rOJN0G5SyPVO","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":106246,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.13\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJfikKyCRA9TVsSAnZWagAA+g0P/A6MCQ7zx/0VkVh55phy\nQaJ8DHP2dNn9hGajtjbWFSkJ9bXYIiVeUDTfMD3i37plkIin+Nq8VOf6mTnH\nHB3ElT/Oj8Dgz9Dxy2rD3OKrwhcKH+93HUw/m3k3QeawazSYNTtQj31uYsF8\nOkpdkVKSkFJGK4n1dkxAuOFac+QtbZprjnT64PQlPiVy7HETzb5k4RHquEU7\nFYlghEuiF/jGwax7JeuYW8ry+Z1TDZSFPBbkrRKe7rhT18s+/zcu0JTVcGsf\n4H23FOrIm8diuxsYjHsdeHDptr1QlUXwpKVojhF7BdU4+6wJR1b8ReHevfnu\nfUX1WuvHSZC+sqd2kLHaefQrKVSucYoN2efI08mUlw8jCZhVxYs8EefRaUZI\n/axqAo9QVwf1uZSYAL9TS7un+YBA4dN9ndD3ND0Dy1aIm2EtWZaKwSfUEZiE\nY2JzPriQH79aFcp44N0X/IEBCRlK5M2dWKEag03/gVqcbbmxVoTh4XTIqZlZ\nW1zxKF8jaaV0WzDZnqgd7EF9OaryZA8+9LuPeqseYi08xvRMgpuYf/A4jtEU\nVBO8QrNx5aIBGMzNC/CZxjp7FC3LUty4EP4UZ3hs66FvztwFUh+1T4/ycozp\njF9nvDVYGrTaSNCwZR8breClikI4U5gSs9b2NPRfMO7DoznW+kN/eTgkbNAc\nO7/y\r\n=vwDu\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/mergeConflictMain","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","browser":"./dist/browser/mergeConflictMain","engines":{"vscode":"^1.5.0"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","_hasShrinkwrap":false,"readmeFilename":"README.md","activationEvents":["*"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.c13678f258_1602896562096_0.7292493633526604","host":"s3://npm-registry-packages"}},"0.3.0-next.74ef0a92fe":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.74ef0a92fe","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.74ef0a92fe","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"e69b41d19030781b10c0a7197cb32638b08b5db7","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.74ef0a92fe.tgz","fileCount":12,"integrity":"sha512-594KanNwuD9wGDlE9wy7mOPiuFMEbZSBEfJeYAaQ7TtJKxs5gqJVWIAOpMfpbS/8XDog2RIcLVJisc83WSZF1w==","signatures":[{"sig":"MEQCIAl50X69QmBSuORQOnh2rAPgY7PegCQt9FDZZLbmslZZAiBf0QOOgRz6xO62m/N9C/qESqM7OnWD3gerqmMdvXy1jA==","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":106246,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.13\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJfi5SQCRA9TVsSAnZWagAAdocQAJPKEW6tGZQu3ai983Xl\npl56F0zB3vJ4mObRS3EjUfCKsCssUp0YQ7ANl4xYdHDpTQXOlZfAFv4cFKaA\nxOjT5jT+UahXwn1GZVSABzKB7yh8r533sMixQWSQgB6+lhpQPBrMn+vOpNeM\nMXfeDUhjme2qLDU2FX2bPzdaP2aok3mQD+m63+R3yD4h5veeUgFNUIID1msM\nby5Xh/2iXMUsloeZoA1yYjtqPfc5tw4XllI/GE+ZZmps3fdIOxbS+a2BiN1v\n8tnS8edUVKGW8fcwJyLD8VxBoMax4DvF7/shHNSFb2vbUHvs0h8M1UbwEFlI\np4Gj9ZHUGgfQ/vmK81o5yIx4G3sffYR8nTfD+e5elnM/Va2SI96p1nDG2KUj\nIH9xMzskXiOsatJKrueVaAHZb1amHe/UsVAy20P9gacCxuDQjWg+licTw4FX\nIjryCoMG2cGpQB3696nx/La+s8RMpqT6xBSzWp6eJkk5hkVwIs64bQ+9x8kF\nLWIcc8cTlbWLYGPwrg/UEYJ/+GggTWx5aZSJMbkWBVTsLUsoTeXE1Y1NvIzt\n8fMY70w5CPUQjPG/n19LETtxwxqBVQHRj0+EJV0CPNASWPHfuko95S1u3p1R\no6eO35DRfDLkvsnJHU9KbYwakVYsv29siBWimGtMpoj2K6iYyGATgBa2NsxI\n959D\r\n=JWkX\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/mergeConflictMain","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","browser":"./dist/browser/mergeConflictMain","engines":{"vscode":"^1.5.0"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","_hasShrinkwrap":false,"readmeFilename":"README.md","activationEvents":["*"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.74ef0a92fe_1602983055678_0.6306813271375848","host":"s3://npm-registry-packages"}},"0.3.0-next.9745766e8e":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.9745766e8e","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.9745766e8e","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"9fe155de1e76ea7524f5ba814229651e36b2300d","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.9745766e8e.tgz","fileCount":12,"integrity":"sha512-Qs4NzGGATzo8sf1Pw/ToshFInQxGBzlVmY8zrwrPEnrlW/EA9iLTRH78TJq86QTSrF/wg4ugi6ZgLI+9bqpsjg==","signatures":[{"sig":"MEYCIQCUgzqt3eGuzaCfaYgGtJi3sDx16OkUnCfOpDXc8DS0YQIhAKdFXhRpjxzphmm+4XA9ASeJuLI1zc8xc/2v6IIdi9nL","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":106246,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.13\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJfjjdCCRA9TVsSAnZWagAA2QkP/20kKVZ0mgpyrnyRK/9C\nW5uGwbJLsYagMTH3VZG7n00AP9Ral1WUk15WbDpDQcDNYlOYquai7wJNTBJR\nI1JIyd1yh76wO3MWTSD0ANc8N4qOmBtozJz+U6CK/UBBk3xDeTzedFsqasYE\nXAjGNz/CKBEQiCJZgBKrx40j+srg42XDTpHm/0TCZO7WNjl2r+2IO1v7UtW4\nohXaQlgOatv9vXVRdnVltzHfhn4PoswToQysxUzH1a+bAil6/DJJBGif32WN\nWjlWqFVKz1bz39uwsftcTRTl/pHG6PmrxM3mRvl248MEKcFGXg1zsLxAdcfh\n8e6b+og/8ctjiSV59E4zr3Vb1hzLKMqH0Uyq8BbWkELJXQeULk+BeSmZvDTF\nqVmkey2zxBluWSBKDXm6n7Jo14HOYluf1k57VFMu3SN99iv7akFAgRr5lTi2\n8/VLigt5awXeLQ5KbTJI1yw7EO/jUhvqVvNvN29GAcv2kNU+aPVNMFvHTMB0\nqEwJj4OJoAVYtKgSzDaHDM0g95w0Qp5w7u3+4KdanSTanEl+ziBZGF5cShxr\nUJsHQq/aHVZHozVTLfIA+Gi4GDTR/deyEDlb/jT1wWumxOXI07AM/n3/enYp\nuV3wp6jKhXpTcU66Xi+qIMwJvrUztA40ogpPUuMgS921dnUQpn41gpRfNNrT\n2q1f\r\n=aEq6\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/mergeConflictMain","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","browser":"./dist/browser/mergeConflictMain","engines":{"vscode":"^1.5.0"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","_hasShrinkwrap":false,"readmeFilename":"README.md","activationEvents":["*"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.9745766e8e_1603155778412_0.5065651512806422","host":"s3://npm-registry-packages"}},"0.3.0-next.6c8c6008ef":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.6c8c6008ef","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.6c8c6008ef","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"fc7a046071f47b9bfcecd008b094a696c345bdc7","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.6c8c6008ef.tgz","fileCount":12,"integrity":"sha512-BjDtx3i6n0sM1CWSYOaL4uXcXiJqlZqKBWCmZBy6EKEf+VbQTH3scOHIVGA+pk3EA3z2C1pvdTIS/vZnSV37LQ==","signatures":[{"sig":"MEUCIQDB4d5mDQ0mTQ9rPN1tfFlVkBvhsTMkoD6R+jHV2SUUBAIgWjyri7/TRRYwjaKwpHEjrbyU+uZwVeiD8rLdTgAcpsE=","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":106246,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.13\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJfj4lACRA9TVsSAnZWagAAV/MP/i5uacUTzs2n3AHFWSce\n5mTlFBErnIRqZGcbSo4KgqrIAeAWqa/FPgwYjBiVJ/k/7kUr/v1LMqucEqbz\nm7qJYe5bLdELrmuG3E3s6S/NWEqJ0rAeWlSNYNLYpOEzcg9G2iUB0e3vhhJe\n6d0z23ka+qJg9M3PtUjkqbmZ0OmrO8+GCshRVHdzuV6rZsLIY+4fs53dPjP8\nxcWVLHxHNtUXc+KzgHfGXJY5E/QAVLxjBYIbFNUkdDGPlgD4+GjMXuHG250f\nw3ipPBvJEhr4VZwQwByXVWWuCz23Qa2BUFW+ET3VgIe+QPKYcHaB3Ac0UvW/\nXyr124ktP+ZQErvL1358EI5BldkafPU7wdqZkVxCqxdQfWGtExUTPOKEk0Zy\ns5Civ6AgKr4O4BZ2KeNaUYwC/ybWlUYVROrh872NHQx2kZgwP65mKaZESCGs\n9GhoB6oQiecHQcFMi0DfB2twwV5vSoa/xj5UwSySXjaZowKjnvKUKh4iCj42\nqDEVUGfvITAZxDowWEFPttq2+pna9voPwXulUhyJUsqyGfbLO+Oj04A/JVGm\niM7nOz7IcK8FBRFu7++V0t3DZdw8mlz2KB9Z5+vaXcfgVY6n0XDp5t3eiLIR\nILybKrZYCWNQBkdRdK3SHpOjjP7S4TZK67Et41yjosiLw67sRjMuVOP0TIYT\nFQnz\r\n=5N4C\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/mergeConflictMain","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","browser":"./dist/browser/mergeConflictMain","engines":{"vscode":"^1.5.0"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","_hasShrinkwrap":false,"readmeFilename":"README.md","activationEvents":["*"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.6c8c6008ef_1603242304519_0.23308166919160778","host":"s3://npm-registry-packages"}},"0.3.0-next.9f7a586124":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.9f7a586124","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.9f7a586124","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"ad3c5b0c76b8d8b822da89f70d26621fc8d60bac","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.9f7a586124.tgz","fileCount":12,"integrity":"sha512-udCW6im/bKHO1+Zl/e2ert+9TUrCop1tukAl4zWNsOoVNa2df4yABc/Bd43oWyeYTdFjE0a9KP6Zf9qnMXS5Nw==","signatures":[{"sig":"MEYCIQCXfYvShmoxlRRPyoQXmaK8JWPkHh20WEBbbHFQBDdlqgIhALjMFAwfOW7lfa8dRHrB3MTKfBxsKFynEkWw8S9+doEJ","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":106246,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.13\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJfkNp9CRA9TVsSAnZWagAAmooP/Rk9PKnHrGuytwzV91jH\niZtdQ0pbdGWIdNka1Eq+qisWLTPjLUYLKvCn0DOtqyciv5wct0tvaYshD9tM\n0bB2hJ28uAi2/ZyI0VnFmdzVJD5vbUWMMeVC4Uzaj4Je3j/rSen/Bgw1Dyr6\nZPtKisQl16TDD7G6mG6tJgCef8RCEW0HR8D9fOH385nNG7rMeQ7DFumlTTh6\n7ZFiW0qubLbZNR2RrxYL1k6o17qZKsW83I0MqQen0V4IFGg4E/OowIDLRTKL\nH7dGqfpGAOss2dnP1HgJjJwWdfNCc8M0Fbxqyv5ZLd2CLq+GJ04cUZIr0c9H\nrEcBXtDj0KTU2o5u1T56ggCZZiAhmoWITPu9uTjJsnmky88aH/A/rnlb5VYK\n1BPTRkhIeT23PUfDtbVvtiNzVcWP0wfD9J+I4lmEdsmm/lq3VuGxuttLdRdU\nCBqaUkoxWIWRie/8VtSrOCEWwUPcT5AQpgFzppJpyNERNg3zxf4fgjEnJJjy\nHH1otT+5wkEk3YMkH42XhiPTrYbsGjR/dDpgp2cYTleonjtxxtUhUL2KfRHU\nk8We/HLxEnxTPdD7odGHSv6r0s42ZTFkhyYacJrylxIqo7EozFqy8cTD22xz\nd8d+/2PjJLZq8EsFKDFEzjKTvGzMf0FfDgwkN/cix9CSCTNoglJMNRIteVU2\n6s7i\r\n=ufZK\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/mergeConflictMain","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","browser":"./dist/browser/mergeConflictMain","engines":{"vscode":"^1.5.0"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","_hasShrinkwrap":false,"readmeFilename":"README.md","activationEvents":["*"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.9f7a586124_1603328636687_0.862185769568597","host":"s3://npm-registry-packages"}},"0.3.0-next.274d4a94c1":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.274d4a94c1","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.274d4a94c1","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"f362fa3d4641b848cf1a9140aafbf7ef5a0ce956","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.274d4a94c1.tgz","fileCount":12,"integrity":"sha512-TiR0Hk3o6oCmHAm/btE7AnyrOf1AUAzlL7iLB0krogf1jUsqb3gz1mHPqG5J/cC/+myucSUo4buTQH59xAH67g==","signatures":[{"sig":"MEQCIF3nRBy7Hd/xe/efU0lLiwvMoTYGlXijNgcdLW/2MBnkAiAfES4AFSjalSu/nCXJ/29lhXY/gtERnuWHJh/tG4EW1Q==","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":106246,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.13\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJfkiuwCRA9TVsSAnZWagAAMDQP/1JuILlxNRpLFC+aXJzY\n7kH1wufIKkvlcFHdreV1nO93tcakmLourlVBRdBT1WQXovpp3074ZaCu9LO1\ngbtSAOGU3UGL1uqE+abqZ3S4+uSZtMJzC2dxCBH7KbpEZRxUt2A4IHa5OaVw\nLLpgIvPu5WQj52oG/hMy9oVUqogDoCR0oHDlsjK2I8NDBhVDcciA12cQVPWP\nKTW+au+No0g8OpkE0aOZb1NyqxFcIhj88+VGtlwmAVrxsKPOQjgkFFT9mzU7\nuOybn84Cmlc5UUbi4ixheFId1K5mKaORmsyUGZSEM7+JMRc+FhwHcVbhojzU\nzfNH2woQ5JzmePI3KU+EGxIGqPwpBcfuVqcvN6XNJNGR1uajTn2D7HCj/UgS\nUmnb4Ym04N85gGUbejG8gysx6Yz0JEcCRs1Br2WZxgTV7SqdCM7N4KBiZ/ex\n4FNKDveTXbszHEvBeKxrn+i5c+8B1S+HYv4T3j4u9lr34IllhEkvslOY02N1\nH9URWPYoj18a0kHmpnAT+waxnznsFjYXDU9I1n4YzcHvyhg70iDoBW4+at2J\n/Y+cj1pVMbhbFsGXG4awMks/v3EYKbMpTB4sphB+FZaJO5HwxhygwPyW6jH0\n7f3hl6LbPoWQFbtHkGFYDoDHCI0d9cNvmNFlmYuLi1Mh8LmoeVMFqGBIFXH3\nPunL\r\n=D/GJ\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/mergeConflictMain","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","browser":"./dist/browser/mergeConflictMain","engines":{"vscode":"^1.5.0"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","_hasShrinkwrap":false,"readmeFilename":"README.md","activationEvents":["*"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.274d4a94c1_1603414960198_0.9763269215472088","host":"s3://npm-registry-packages"}},"0.3.0-next.cfe2fd1afc":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.cfe2fd1afc","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.cfe2fd1afc","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"e302b13c49afd364fc3b4ece3f225ccb35ef9c96","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.cfe2fd1afc.tgz","fileCount":12,"integrity":"sha512-/Qt36BRh6z9pLGiJXg55BQLqkLFKrL2286pX1AvFmzw2ofCMgJU0pUN6H1XrfFsFswdudxarr1/h5kZYm0pNcA==","signatures":[{"sig":"MEQCIG8RPpzI40htafaX16npI/6HsCImjXDM7P2EV7re51rGAiBDQaN7MX4GpejwSZRVBD5AOA7aoMInv9DFmIpCQRuJnQ==","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":106246,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.13\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJfk33gCRA9TVsSAnZWagAApUEP/1mrQi/NWghwhWZAoRna\nIYxwdg3fB1bQgBmRDHLSqZrLWA2tUJt+aMUtHOrDHL2tizZk8p/b55DIxDlc\nDiu03JMSHnBaWMASCbWsvOfIdDRLwnQ6WvWNSOelxTWI+tvMAsWnN6Mm1bZh\necyAQjaRmZY69ytnvPSg59pT8SjzalZRc8yAv8qyufRugrVlOmyJAo/reNVg\nq29pn9mXb7OOQfyv6fbtUCnavYb9cgZsEovGgN8jGJ27SUmhYE8Na9QeWinm\n4mZ9WZrMWLL00T3h6/KcJZWg3O+RC8X1+40m4LbkqADJpAS3x5U4YgbHR07O\nAT09SnZGOA22hhm7oW6WDUijm8FGcg67fKX3QGe2uAD0dF2T1LTh7Nhu0l2E\nhbVqjf/yhhlZtyMrRDeVVbDMw8FO+EGOD79H9m5gGDdLAYxOeJo9KYth7nFh\nKkBS3hkrtQ0Y8a8Oo4NCFQIsGTAo+9B0wiS6E/jt2JGYTjGt63jJ/4ndNJgD\nfhaEGTt5RyCufKFZ6CYvnQld7rNgde26hse+DBnxdaQib8ll9m+hTy+bcBlO\nS6yYEV6OUnDSl3ZQkBs4k7s0pBGQ6msnjJQdDKJjYiPJp9CJrarPI4Edh9o+\njCIQnnkRG1EzJykBvh7xAH767inNVlBrId8TqkmZ644CkqkwnGYvadBZndlQ\nEUyg\r\n=J1aM\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/mergeConflictMain","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","browser":"./dist/browser/mergeConflictMain","engines":{"vscode":"^1.5.0"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","_hasShrinkwrap":false,"readmeFilename":"README.md","activationEvents":["*"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.cfe2fd1afc_1603501536180_0.03510317693021969","host":"s3://npm-registry-packages"}},"0.3.0-next.1e0df6a4ac":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.1e0df6a4ac","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.1e0df6a4ac","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"25555b1a68871b303a1c2ecda518146c5621eecf","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.1e0df6a4ac.tgz","fileCount":12,"integrity":"sha512-egBISvqBlwqlfn8AZI1zaHBGsCmksv2OaDW1WluOnapf8HuD53WMvPCU6CrWWJP/ZdCyW2sxg4a0vbrvPDmkQg==","signatures":[{"sig":"MEYCIQCFJz3KfPw2BoLigDmvlQW4jr0O9MgAkR2eL9SZQViv3AIhAM1w34KpMX//c3I3Kz3g3bQUxCFicg6tVcbvycTetDic","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":106246,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.13\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJflM/oCRA9TVsSAnZWagAAQLYP/0mCHiIguRxSjrTlFzXm\ncrb0pBinet0rnGSxemL9KSUcqM/OXFgiiTjfPZKTTuiMwfhg9b75D9miY9NX\nWVYFQvHMVTsoIM7HCdXTMTJ6gffnZFlcBF745Llre8Kiw8RiECLnFWYSSHaI\n5sMjiAQkmA7mbBB9YIzXxHtX1rRxLeJHmO8PWJQhow6CfEHu5vK1aphjaK1N\nG5w+ubthWADZOLEvZp5cU8plrrUek2sQEod3zZC2QwfQHaCsqJl8iVHUcWka\nfmaOW3dAf7iNvuzCwb4clbhpg11gzHydUWdHXaa4g5CttJwC+jXQ52HT3wZC\nlMoWkccLTCybuhiIb3xxvqNNWyezoYrKv4puwY+R5ld5MxSAP4cTTB65bkiW\nPys5SBAgZFxGS5G6Fph3zmGbZ5qlicoN+KynEt7G+7qTNLTTIREIcLb8Chs2\nt66HAcT7hZoFq78z8S8NXZCy5xZlK7FBA55IqP8WLeq93y5xIucxcVPTa15h\noWaWi67KLszKxV9nybpOI3YlCmBFTbumP00r0oZoFqASa2qxsf5EsncjxNW3\n+5/2XThGoyTDHJcsIz3ejoDAGzmvZXaimB0eVFm9Hg4QHCbC11vSZ1SM8H15\nOuOnHXOp1Y1yW19fuYI8KzyTnS4SKzrfJVN3X5J1ERfnhUYyH4UdjOHJ+tO1\nSh1q\r\n=4Qo3\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/mergeConflictMain","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","browser":"./dist/browser/mergeConflictMain","engines":{"vscode":"^1.5.0"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","_hasShrinkwrap":false,"readmeFilename":"README.md","activationEvents":["*"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.1e0df6a4ac_1603588071924_0.5248651720594983","host":"s3://npm-registry-packages"}},"0.3.0-next.b56b94a7e4":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.b56b94a7e4","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.b56b94a7e4","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"ce1044805211d5b82bd92ee691f3112fbef93bfc","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.b56b94a7e4.tgz","fileCount":12,"integrity":"sha512-ckmjcoQcuXG9Ld/mYrdmpiX5q6Qc21eFR1ha62T6EDvcuQLXlBpFa3o4V7TUklaY9Ny6xvzqC63HHtiXa2405g==","signatures":[{"sig":"MEQCIHe6riF8i4yO8c4OxNYZCsRdi7gLpUYfONRd4QBI9GlyAiBAOejoqmlRyS3EOgSNYPUCc9lnvC1mKkMRTa4Uz/e5IQ==","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":106246,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.13\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJfliF3CRA9TVsSAnZWagAAYVQP/jNVnWmyEAqjsw37XsHq\nVGEFq+bUAcOmq3AgOXx8eBF3gpsC3zeaWfkJGtS/8DzFAGscbeoIcy+RdRdk\npSKQfpoKRbiUwYMLS8jIFhkvzCw9McD0Sp9t3vJ3cZrES92qkR05iSdtowZd\n4+bD/aIIRmhZYZTQzMV7ynZmYEzoSkCYIseyMx/+m0TrjLzwwn8Sj+DGkFWy\nPNZmjrKQQHxhMLF0U3zMvfD18zzNuA9rGw7FleFthMZv4XYZqt9C9zhBqoGY\n1kMSIf+5XiMBMK7Z97ruMDDMDvX1EPQMnGBIOvGLCG67YoAdNX/Gi9ttlSCo\nPALLsUTJl+EBRT9hbZVC4H8vH7Lb7A7mUomlU+Yiww4/19wDoHX0p9IdIvQ5\nuqFgL5M12RpeNOQDWJITPA60Sr33vbTCv8C4+ta/x9N3xF8Wdx4+KqBXE6Np\nAIBkrIt4+7sZJlL1aYwHUldARwNQjdfWCAPuDRkCRFkHrWI8jAtLI6KLMkzo\nnALKRpMiZRK96g5rdL2k5wXkuPMOEtT04z7Izhe4gg5Hq8LxNrkd2Fl+vYQa\nMrgB4POQsWtt65fZJbZPSXwfFJbPumddKuhxARy+2wxsp/G4PmNNBgdQv6DX\nDSxnKOtyC4wot9337ypAr1sfxuWt86j+zYxNQUzuEItTi2P0QUxPoXyoG9vP\ndwAP\r\n=Tg7T\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/mergeConflictMain","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","browser":"./dist/browser/mergeConflictMain","engines":{"vscode":"^1.5.0"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","_hasShrinkwrap":false,"readmeFilename":"README.md","activationEvents":["*"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.b56b94a7e4_1603674487210_0.9442827579075728","host":"s3://npm-registry-packages"}},"0.3.0-next.15a3164768":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.15a3164768","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.15a3164768","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"1dac5ada69ee842f0823e9ddea3fcc892e3dd4eb","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.15a3164768.tgz","fileCount":12,"integrity":"sha512-r63cT+7nKVVcWoSLQ2Hj385uEELa3MVbBuL34Ja84sydeo1hDBo1XqqP3KRIlC0QIa8eF0NUWEvFxTaGz4RYZQ==","signatures":[{"sig":"MEQCIDvFLcXi8Ny+JsIASvGI2KFrhs/ei/9kpILMZ7oGkReeAiAJM/udZyvkPwh/f9jzB8iyM9B28OcIZ5lqPOEsOZ+LKw==","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":106246,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.13\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJfl3JXCRA9TVsSAnZWagAAo1QP/Rm7mNxc65ZpV16RYtGg\npNfW2Ye5rzX8jqnTnm7k6tJP+AdqouJdgR6nWQQhLgTQf1rkwlj97UOR4ccJ\n4p+hDrgUfk4JmMdYB3DqVNafidgUxfRYyLwHkWo++zx3yhMnR8dxgd9PWhnB\nh6hgKh1JQXBvEi7WUF1xkTftIfTkHEGve5+aDJxFBRcunIHMEVznX7xAYLLZ\nUuSE6I2HP3kOAdZnzb+W333Xpfito4UVYNa2Vh5kq7CrqoLG+l45SlE2X7OZ\nH9/foexz3AHWrSSQ9vOPUSFjCGwFYzWE/n2/Pz3ee3HVnR6K3U7mo4+X+BJi\n21o6CrBohLxcxVn+xP/HJWqlG6cOCqrP/d9Hs1PH8s1dHS26n8+rR+wf/85Y\n9o6tAsR1YnV/boqW3N8QXVJJZyCqtGu51nsqO3Pwd6i0kaFQ9n3AT0Zer/wF\nJOSfLkZ1uJGUR4cFaarKRg+hPQ/rh0uhU2/IaIMH/v+N3iaVaLpBqZmT5/46\nyGIbuMKMM0Astax1VcT1iCZEB8GAn5y/BTUALDucH5AI3ztt9qiFMaiWjRcL\nF28Wcr9+eCOBOuHOc5tupZufXm669kXOIZMWb6POobQhZB3JsNv79mSIfvi1\n/ssZ/ldbhAEXN07MKXcxulHOlYaQDJBtwzKShKHnoBHPUZbJB2aW92nemdUw\nmSAn\r\n=UErP\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/mergeConflictMain","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","browser":"./dist/browser/mergeConflictMain","engines":{"vscode":"^1.5.0"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","_hasShrinkwrap":false,"readmeFilename":"README.md","activationEvents":["*"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.15a3164768_1603760726841_0.7220187320546683","host":"s3://npm-registry-packages"}},"0.3.0-next.a9bbd0c09c":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.a9bbd0c09c","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.a9bbd0c09c","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"d14ac5f536d9f532e2431a559db49a1e8d56e670","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.a9bbd0c09c.tgz","fileCount":12,"integrity":"sha512-K46KIfEILpoEOMeU1Bjwz7vkCdYSHoA16p4aMwl8VVHHw1OsQ5wQO0ZHPjn8oJ1nBzZ22tAmZgz3WLeu4AXkVw==","signatures":[{"sig":"MEYCIQC8lfamUaW7bMFhevPDKHeR8cAzUbvhytWbhICXF6sWhAIhAL0pBUDbmfwWZdkQsW+tewdw74vxc/CT+l8sGCWct/wW","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":106246,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.13\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJfmMRRCRA9TVsSAnZWagAA1ywP/A9ca2vMNp/k9XfNqk/E\niiFQhzBoBqkykMkL14RV4VrEeiD3Zt/6FgCPneFabqenm+ZeDXfol7IdpPBY\njTDeCOCJFYjo4sGYOGKgQOhSF83PFT7GtHehf0ccyIvI0icMywMFjFct6Jx1\nmc54OGc/ylXgfg/ZuzAw7q5fZCZnFKWpzK96I5wMJHMfThNIKg7FP8Xl8oEk\noLO8Ce0h9xDVLfjh2BtWURAi82d/LL01m4SJGWmAfyFA9i3lz4mJETzKfJ56\nGTYlW7Ny/RhlMtC4VzdwvVHBHgYWij3ZGC9yLmJbFDgPLrMMBX8ZLLxA/k/p\nywxGDxKq6KgFZ1g0PuntMaZUi1MfdPdcKvHu9exXkjeLyywNIaSQGoLVzeUY\nNPl457SE5cpZvWb4NrUh6yurdawIjiR0yrjlvgIYdbvGBNB4HetJrdu1PQM1\n1zIyEfzInM0CkQaZI1tR4SFJt0EMJinYE8tw6Kn162tSlKNzqEpyNqGHwpCH\n1uqQ8o7qK/A4O9TfluGJWx/shkEgm7BTaRC6fDDLrJAQ3sLEKCysghqc6mYg\n7Qu0segfuJy+Tzwa2o3wRF6xBmFW4ZcEk4Fo6rT4Y7ixHkNBmipA7DZu+qOu\novIJ+rCsbDTZ945zz1hESgNQpk16tKKMVc5wVsKCxO3zEd1HpGNcpyDCGMZu\n1TMO\r\n=+A2T\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/mergeConflictMain","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","browser":"./dist/browser/mergeConflictMain","engines":{"vscode":"^1.5.0"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","_hasShrinkwrap":false,"readmeFilename":"README.md","activationEvents":["*"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.a9bbd0c09c_1603847248683_0.8283657392337709","host":"s3://npm-registry-packages"}},"0.3.0-next.7210c7246a":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.7210c7246a","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.7210c7246a","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"bb33492518963f5c1bfbd33effaccb8490fdb86f","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.7210c7246a.tgz","fileCount":12,"integrity":"sha512-0F1AEtyIO1fzs2P8GH/+4dB6pzBEhvBXy7izThw8y/gvwmewMPVKO0LHBdjbfdayq9CAKrK8c4AA1OuoEF3/Vw==","signatures":[{"sig":"MEUCIQCBSVURFFRvnq+Ys/n1HypeZnNJuiQACUT3vJ1x/ZZFxwIgbmdTI0nsADqOIMn8Yj7aoqVDA4vEXE1zKKMEjzhXf6U=","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":106246,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.13\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJfmhXQCRA9TVsSAnZWagAAiPsP/2dw54tzXbZ54t/P9r6f\nsHjimZjzC9gqs3ESbgBJ57XfpIUBtPalmaDQvCJ6ZW0ZOAP+bqyWu7SXWW3q\nRq+l7DmIo0e3Nbu4yKgj1sf5KcbIwESwP7/kSu1fa/lPSSPu7ZUrhtTWj8Ur\ncT4eqTp8h/xgegloxh2NF5NSamVUOkacjq93CNmvTg+v1xrIjUeSVBLPmmev\nOScEwSxdP16lKTjj506l+yNMcDDVuh/E4wI602NB7BO7yZIN2GlGZVtUYddf\nTjI8G72fgiFCld7NOxdSPJImsYyXRoB9vr+TMLqVjNnuXdWJFr1qjcqJtHqR\nsSywW/EvoGXlU0odjbPPY4ER1U1KOgzRNZ0IfFi5ELf44ZUv1aniQrT7Edu3\nfWeEW8++ZhPrbmNQ/mbnabLchodsqesIVxcbujE/CO/TOYRf/LSgc0oF5tan\n80lmXmoaDCkpr7DPEWFmq5yDqSkVPi9wCTUkfTpQeTzbDRhBi5deh4NIraNQ\nh8LDnWo1zOapa+2Dzqj8H1NA0FJOoF5zkKf8A6EsDQq5FKZImzkAVhCF3HpO\nAJ/lneGwyzNRT9ZbAnqcdr8DxhDHur7fpb88qyVTB3D41tfefXYmQOBJAERt\nUehftCfcenBWrMcuAuIoR/XU044Oe0vXgBw4DcbtfF1QHzwc8LvPMmIe6glE\n9+Z/\r\n=zrSn\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/mergeConflictMain","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","browser":"./dist/browser/mergeConflictMain","engines":{"vscode":"^1.5.0"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","_hasShrinkwrap":false,"readmeFilename":"README.md","activationEvents":["*"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.7210c7246a_1603933648176_0.13848915689514785","host":"s3://npm-registry-packages"}},"0.3.0-next.04863391e9":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.04863391e9","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.04863391e9","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"345c70ed3fa2837cf26989dad6c7f20f62f3a735","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.04863391e9.tgz","fileCount":12,"integrity":"sha512-KSKR2RKnOf4idezMBkFgqBUKeH9r5t+hN/SXAavb0z4l6U1CWZgJxV1HJCYrwPzzCwzbiT/zSL9s/4sAbiG70w==","signatures":[{"sig":"MEYCIQCPw6nKoSrlj0T+x3WPbiyjDCBmn9/aBjrm7DPqTEBZJwIhAJYlnpQe39cVHqwpgrMjCCUC10OUz5zrgfjtU+tpLBSO","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":106246,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.13\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJfm2J2CRA9TVsSAnZWagAAP1QQAKCttsTeysK3dpzt3rhB\nk5t1QGl9kEtafNN1a7qK9BqNyVSTF/xaBTHaFOrx1CxilFJnXwS6xbmoQweo\nu84Y6qSKJBp7hG2/25DgZMXOl0XonfO+uqgtGXIYR7uhVSCv9bKjE0BV0Ia2\nZIdXag6g+iaB6N1sYe7vKuELYNV8Wbza70XcAGZ1KcVyeRH5K9o1VIuCcWfL\nEmP1tahoLKmDJXniwxewfRtCchg/4qzddB1sJkXgivI8ReE8rHPVsjORX6VB\nYMFL7ePrSgXA4CFHQU2Y/V+1Ky2algu51J0RkU4v/i883rlCOuMI9W33wUnX\nDdLti/wpBHP1st9LGIE8EUx+6/mrMbQeYKowjafejHceWtkp1LgY/qfDr3dq\n6XSpoROXEsPEhExsz7TR/9Q9wSfbH7Gu5XNOGoDzVUL7oIWxjFajc1ECy3Uy\nAMOFNiHjXs3DPfhomNmg1ToHXe8UrDLAcYedAj9s1TldgdoPc3QkBIrP3swn\naKZ9HZW3V4qcB1VWG6J851poof2xpS1Sj4Cw9qqI1veoouCf+UwDWzmug415\nTLSElnjUgYucamJ0aGPOAE3o4Z1XH7JiDRakFIv1akm+5/Fl+QpevwIRhh1p\n1IKbtd9XmnjlJEzxzTpGkzgfSzRJZbyeV5LGwYRLWL34HDOsPgKBLP6SQfKR\ncjVb\r\n=p76w\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/mergeConflictMain","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","browser":"./dist/browser/mergeConflictMain","engines":{"vscode":"^1.5.0"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","_hasShrinkwrap":false,"readmeFilename":"README.md","activationEvents":["*"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.04863391e9_1604018806390_0.0018488710006239195","host":"s3://npm-registry-packages"}},"0.3.0-next.8abfa9bc03":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.8abfa9bc03","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.8abfa9bc03","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"8ac017403d849986021394aab1fe98460de6aaf4","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.8abfa9bc03.tgz","fileCount":12,"integrity":"sha512-4DtIPIyzu0ok2MlZbd/PgQdbhrEwMNt8LyOMi+SAcOrgAFsUD+co0eTaZueLMgmtrP8H4WNb6OJ38dEloRZOwA==","signatures":[{"sig":"MEQCIHA5se9QHrAa6y5HtQuxDb7Tc77EN9v5WS7kW2NsvbHCAiAmKbMuSlB4/evkYfXa8x2c4JDT8xcZZSDB/VKQ37wG8w==","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":106246,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.13\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJfnLM3CRA9TVsSAnZWagAAnwgP/i2k+r/b/0hPSMJE/Hte\nv1RDWakb36WZoVAvevSUzxN3jkUib3+YsI48COvxMGlW6xzwX/1FokdN2xEj\nEES3qI/WZS9xMvBZSXtgaR3Sq4ZUQV9795Iv3n8C1mzD7C1dQ+n2rce2hEGD\nv+Y/5S21yXJgESHCMchGp0EpS0tiQf9pJFZwkLcl9lpeaIn5SDSuuXk2aY5z\nnMzu1D1pwNnMQ9hm72SMKj/eTAUO79V6/tc62h5YEdYCh3lw/Ar/8a34k7qC\nXQacXci7a5Q9qy4cYJyB6oyn/1d+Lnqi5HhxsNLcOv7rZqSLOMUEU5xml3SY\nJICcXT5XkHRmeySFmJeo2BIaajcpozaI72Gb6bvyxcrWcy5K+HB8lcEJ8qm8\n+jEF4tsCcdch/CIWhcHJv4+bbbIGv/XDz70OO7IP7wAzZNVpJCgY0mpmYEQN\nFHwLXTTLHwT9ABVEfyBbph4sY9VLYDEdtFiPlaeNKPaFKzn8vY5qJ4rpnw9/\nOltJNv4pS2pA/cSqj7FZNdYwqrjbOQTqH2tcQVuHNz2B+cPgo70mgYOyUs/U\nZIhsV6I00osbtz2DWQZDXVFMyiKokOc+r4GLcja3h8LsrlvdYklhmaiRCqzX\nHDDQOa1MrQQbCVLq4X2JOlppdRZN3RGGOup0S2wr3HcTa4qQLDsbiCZU1Myv\n0c63\r\n=1kOh\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/mergeConflictMain","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","browser":"./dist/browser/mergeConflictMain","engines":{"vscode":"^1.5.0"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","_hasShrinkwrap":false,"readmeFilename":"README.md","activationEvents":["*"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.8abfa9bc03_1604105014837_0.40291161958966804","host":"s3://npm-registry-packages"}},"0.3.0-next.5264ab94a3":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.5264ab94a3","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.5264ab94a3","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"ee8bf848bd107136816a22c04f0c014ed22b7349","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.5264ab94a3.tgz","fileCount":12,"integrity":"sha512-gqQuwGnsXNrUk5c8Ps/+NmBLh6W3Vpxf6vkN53Xu/nPDDgo0xdJW/fzxktOqLt5mi5/pNOP6tGcFsVH8f29SgA==","signatures":[{"sig":"MEUCIHzOaD720NLtOdwF+nGM5Kr/kljmtamftsdXAQSi2hR1AiEAvFB+beanJGazZbGg28OpQ2i/K3GBxASqZm06yaA+2yM=","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":106246,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.13\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJfngXqCRA9TVsSAnZWagAAApEQAJBfTJpSAtt+tAejn3vO\njZzKT14srLXrdWMeBKjkrIugV12e2jNA+iaaCqhvMxf/c0gp99ujYKfGbbRs\nOHg+fl2mp1oY17imO4DbrI3gEdmc+nMBgDa6O0GBacAJgiQyN6DqfNHnz3hR\nsu8ie9dZ5ixVDr8emKaLz2FjcM6FJtwyc4AYaHXs4HtBWvix2zKDJv3cE01/\n1yY6K0BfDNWdxovLsRo9IIuQNHd7yVgRqw5btSbTVAzUintWBOWY+E3Kxp2r\nC4ARspReOGVrBdDIdg7iux8CZLNbh4gcFAot1N4wq3c5DsUJG8YCk0syNVjk\nLpwTUzU1CW/BuO/BwOTKczGEHulA4vmXcFsRmJ014jiNf3G+VLa727DfBq47\n4ZXD2xbR8CqUSDuuRF145DHpH+tm0FY8AXcnumJt7GAWYeWIzlFq6V/DgzXr\n6XVo1allPhBJyMX0Vt+cZifKQehPtMhQlmd/HyL5T5EO0gTXtlpYHTfZTXcb\nAy71g4xRGfBWWIRhrkpkghNbq17VYiMjhHglHo/X3G7mpXd1ZNqGyryW1qn4\nrxZKf4TnAbTDF2U0yWEO7Pp+12680l0gZYN4Fhha2MMHDPFWKzT/WKMu/Ofh\nWuPhVguFwwkQ84kQ7xi219i5xdI15nhyeuA6y/ENovpNjffmlhpHoUHzlrGg\nqatm\r\n=sRpP\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/mergeConflictMain","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","browser":"./dist/browser/mergeConflictMain","engines":{"vscode":"^1.5.0"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","_hasShrinkwrap":false,"readmeFilename":"README.md","activationEvents":["*"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.5264ab94a3_1604191722219_0.28687745625852856","host":"s3://npm-registry-packages"}},"0.3.0-next.ad1dc7f87a":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.ad1dc7f87a","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.ad1dc7f87a","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"c844894a44633916efa56448d82e8cc3c5bc0934","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.ad1dc7f87a.tgz","fileCount":12,"integrity":"sha512-e+qSNvBy2Z3zzrAPqzYnBzuprWqWVNbwKcEBQomWENBPJst6NYHvdBdD6JJpfhOnxZcCZ00EJvIRAiR8cgFMJQ==","signatures":[{"sig":"MEUCIEwkN88XHGd0/qGlnqe1r42rV3fKR0x1aNoTm9zrKXLmAiEA8rRJVYNQKxAVv7s+MHe+jchqVq96t/0RKUQaSP6k5T4=","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":106246,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.13\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJfoKguCRA9TVsSAnZWagAA2g8P/315gNnJqDHTpokWMLt6\nYfPwL8TpivhBSLKji07CfNa8jcdDZVWdvIAVX4B4cx6Ghj4U9El+s0JD2rM4\nPModCVmYemM3axOryZyfoie4LGJ5KW8Lg4A1batXeiu4Qi4D1m4uZfP6IdHx\nipSHnX++zm9w7T3AU1IYKm/dDyyIKIZEAgSNXSkJB4MMkR4QLgka+nWdOupz\n22j8Is355TErXivI8EnF3Y5JWqRZ+lhucgNxMpsUfo27kYmnbLmVU9sy+lxN\nSuJSIBFCc9uE+JfuqQJGkPH6+F3dDVipyd++Fjs+WYvPSw98FqPiyjxcEkNW\nlXgPaJWTsK2CLHMeWIbxDI6qcAi72EHfGDEEoZMm5w0Ut8kxxpcBz3VpAlJ1\nHb2fyivfb2Bymby3gHiDPm8Yc+7QUexWo6cRGrxNOgUTYvKgqXDgkvzMgEDR\nFbwwweiVwIeJQx7kDJd1PncZC8kI0TBLlmDE6bhOWfvuaQ4UThMblEjg6pB4\n8Xh0ljuT7fLRQqexR/a1r693o0W5WqVzkfVKyS1Rac9rm+F5Un4aNBMC806Q\nMsWEhz98eeaBmmKhexpaInXhj6ESMImUiK9nJP5wpueUB3zplWdtHmnHrU6v\nGNbw/o1tLFQt47+n/AHNBIeEX4U+2j0JPzT0ppBOQQQ6I1tGNVaWfLZt1DbU\nWFpW\r\n=jCSM\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/mergeConflictMain","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","browser":"./dist/browser/mergeConflictMain","engines":{"vscode":"^1.5.0"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","_hasShrinkwrap":false,"readmeFilename":"README.md","activationEvents":["*"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.ad1dc7f87a_1604364334405_0.7874062438616594","host":"s3://npm-registry-packages"}},"0.3.0-next.265a2f6424":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.265a2f6424","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.265a2f6424","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"c29ff484a7d5c53f03d601fbb4b2128b8faabc29","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.265a2f6424.tgz","fileCount":12,"integrity":"sha512-PMBKsAyiup7zC5TLKI8KNNojKg+D1tdO+GDJ9LjxhLh2U0wDJh5v3XkZMgkF9ICPxn/pyD4rI2NTXDQeMu1VmA==","signatures":[{"sig":"MEUCIHf/8BDs6YlkKhparMCDb/fjLM6CL5HuotuDFaVgvvEnAiEAoVst9Adl+AbsRCXs0YaFd7oAcdiF/EX2uQv1edAPF8A=","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":106246,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.13\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJfofniCRA9TVsSAnZWagAALxsP/1E5PBbVfUy2cbR/NVg7\nG8DydYLOLKUFqRFYmBW65s/vP45CZLHismRyH8iWV7IgRDOyJX/7EHpk9tOE\nrc5Fy4DtqGLGQhQ7U50STM3EP+gcxid0lRKvypjredGO6F2tebimgCHRGBvb\nahLriRh+OCG5Wb0kmYgUSv0xWaW/or+RK9OnIPXt90DUqmXPzw9WFyQMLbpW\nh2bYxmrSO+CUlUP7yJHjvFagWfvCjzP5cdEE8EetAY/GgOvYaPD1v99mj8qJ\nJ/aXOHQVJK5Ik7Y9Gev5bz0GRZfC+cB4sFRwOGI06GFan8NcbB81KisCshPs\nnEPlUO/NnrDXZU0PyRmX+rzUo8NJsE2/QlJD6UmQ1ZofipS2USrsMUGRu8OI\neuhhy9I+MRMaKea2xC2PrPxpcReUwHWmaUCjEjIrl1T8qEPiBXIeK/kGqeo4\nGq/qqJzK0CDXkFTlA3utSxmNj+DlxL63Ls7ivirtyN3ZuslOagnhapTqDRbK\njzaDvPcfot8pr6nUhUEghw2SgTXz8JalJLw/rutEIi9v8M1fIc0+taziuwHg\nOoYUf7BDbaKq6oh6AoTI4Zx7utxz8Bz31mh9nweyQA+kkOh02KgXO/st3n2H\nvFxVwySDcwbHcMKUPZn18rYiE/3ErldoQjifZn96hVRUrtPwduxo83yxN80S\nd3eb\r\n=NVCn\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/mergeConflictMain","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","browser":"./dist/browser/mergeConflictMain","engines":{"vscode":"^1.5.0"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","_hasShrinkwrap":false,"readmeFilename":"README.md","activationEvents":["*"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.265a2f6424_1604450786056_0.20228565363636575","host":"s3://npm-registry-packages"}},"0.3.0-next.d54c3c67dc":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.d54c3c67dc","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.d54c3c67dc","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"da8aaa3055e820b111c2b7fcce79cdeb3efcaa40","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.d54c3c67dc.tgz","fileCount":12,"integrity":"sha512-G6y9pOE5QffW3jnkh21t0uMEVWt5BL7JHa0sPLfCngpeDViVs5nusE9yWaYOxFHMf5bghiXYndXBeUc0RRlvDQ==","signatures":[{"sig":"MEUCIQD9xVfq/MC3HflGahhuh6HSVkHxyWrbkYOaZoaXOtyTLgIgXcPWo0p6VkaeoJlN0OpjARqvtkOPnv2yEluo9YJwq6M=","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":106246,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.13\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJfpFxoCRA9TVsSAnZWagAAziwP/0zSwGSdxhiCXhSdvWuL\nx4eGDmWqmCOERgeosaJBlsbpVnKTDfjIYdlVT5S2RWAJuPvkUDLWcaHouOtM\nLvaGu5Cc0Tr/VlLMaRszwCKqlQ+NEL1ySEUKh9a2iMIF4d9YchdsYCBIr5pY\nSnaZyhWFtGT63XnHEXVnmK+c9JcKwNNMpTczF5lLsAlNZFBhwUCWxHPFOfcW\nRvJiJ44ejIeKwbmXmOW0GIcGWyYQ+fFTRhXdOeUe7mkDaOH2wszPPpG2D3h4\nrzIQEu7lOAQiiByM/o3cm6GPNe6oUPrOA6QzdaNwifZDub1WjuZB+ppbXQeh\n4kuTeqqvzkfqZP3Q6lyWcfRQEpk5XRbrHJa1cOn3NRdUCzroKHXYZCXy46rl\nhfrO++sgbPti6MT2B5eFTpdHJM1gonmcuAzWwZ2Umx7SsOPMByK7i6qwnFHg\n7PNVnnA+nzgn+DXQ6z3AxTOOp6cnQ+DsDK1LlDCMQfNXJPXbBieQuBgHA06q\nfvcTib3mEroRbjsVkBKyDPwEPcHubRiBJ6RtJS2KcXxDDF373uev20moQUv/\nNAOAp3CeNw5VkFEPtUqvpcj0w+6CW+QCw70gs+ksAtSWXPpGaR/zZHJnaKwD\npkSwZXeXS0epBqV3wO7p1UoaOdYIOPaTEvKL6pJqfp/69cK2hdnAk94+CcTQ\nNGzf\r\n=SixB\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/mergeConflictMain","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","browser":"./dist/browser/mergeConflictMain","engines":{"vscode":"^1.5.0"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","_hasShrinkwrap":false,"readmeFilename":"README.md","activationEvents":["*"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.d54c3c67dc_1604607080324_0.9380844696022284","host":"s3://npm-registry-packages"}},"0.3.0-next.93d736db23":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.93d736db23","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.93d736db23","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"88c1dfa50996327c215d081a26b175eb4637efec","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.93d736db23.tgz","fileCount":12,"integrity":"sha512-6d9ZohQUP2Q0ZyJIazxGQtATKTQ30kUjkKoJA91Br9pXPgC2buNXU1VtS3S9822fJBie5dTIjxMAoFxWq6zL1A==","signatures":[{"sig":"MEUCIGudvfJLvcjJGQ2uHLx8jw/Xxq4lKG8gl0qDR3kHpuKRAiEA3gsQLSIqsJF5rOpbkQQ0mkTUHDPaPXrm/S+LRJQcQVA=","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":106246,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.13\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJfpJ1RCRA9TVsSAnZWagAA8GsP/Aqd7eFLlr6KrKnDE7vu\nwTiT8Dbl3nC2o/ibLx+FGtqmKEEYSKUhnjgxcBPuLqJzelxwhMjPBpFpZdii\nSyxltA7X7aKXve7SWh5SyjRsNtAovSE8b+deQ+ybYJOGu+KQesR5J/E3VtCn\nHHbmnagFlb70goSfBsk7WPJaQxw6877boibBT5ir/cJSX2x0uEH1y91olybc\nlPy/fsXy7dIXGMDWOGOP9l/Ac2BdcxcG3iBdKn6S9Y5UPT5GWItQRRoFOfEJ\ndn3hylRxAiDX1wuWVgKhxPhp9FTp0gZHYGabgYTyPB3XGUhJwv2Gn4JtUQbs\nNkrImONkjQWUe8H4hqpwpFMlB77S3Qr3u4GFSNAzDt9rerbfi8dIi7IZatNR\nS7BIjkEndTTsCzQJRL0TK/oN74nvprKkTSvo3xWC+uzLHEE8H9SWQ6t/1KJq\nHPntl9pl2S1Ns8jeaxulHY2BXW7e3CyFU20ZP2yVWmwJDWWygFQ92tT7CR3T\nSJMHoCYoHkLrWBUJh8B+ex0XCt3xnHLVK1hNBEjxdHijUNg8XclU1IsZU8Ui\niU3iJbF5UAHa99FoMCLESxIy0BwfR+ZS45xK8wtOYy4w0zNb5uB/3muF7IHW\nxCpHms7lkRZF0F61UF0Fu0z8qFsO91DsS7ApGOxRx62Q39ywRLMQZSPOFN7j\naFlE\r\n=VCBf\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/mergeConflictMain","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","browser":"./dist/browser/mergeConflictMain","engines":{"vscode":"^1.5.0"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","_hasShrinkwrap":false,"readmeFilename":"README.md","activationEvents":["*"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.93d736db23_1604623696773_0.29523218340941826","host":"s3://npm-registry-packages"}},"0.3.0-next.03c38e6702":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.03c38e6702","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.03c38e6702","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"95c03ddeeadb18b4569458f27ba59a0ea3c6da9b","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.03c38e6702.tgz","fileCount":12,"integrity":"sha512-ZoKTmKhUmj4101aDN5jyTa7EatbveY1lM0xWoDLMYcubBqS5WRE4VOwKQ7pFv142q5LKetbxVVoPL92d49RaFg==","signatures":[{"sig":"MEUCIE72giLz/84lYJ5CFAL1e/6bDKpVAO1XgCam9LpmnAJwAiEAprG2pecvgsgm4smY73YqdYVYPjt+02kEqvmjb5PNHyw=","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":106246,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.13\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJfpe8cCRA9TVsSAnZWagAAP3EP/0kuMOz9pzvALvxPuUx7\nm0FOTDPhqqTO5FMHRmnXNO4+qBPRraXY41rENQcY6caVLLVT8UClOdX7tRP4\nDpCs0ARMMiOo840r4E89Sawv4jNt57BTUZEWwgioRPtARtgWN0+fr0RL7j7e\n4rN77KsX2H/6/LPYyVlzNfd2WY5qH56wFprtrYwBOKhCenIVRxTSL5abxYI4\noxTbFcckm6CjP3dk8UlqQfCJ8iioLlQ8QMpoDKHe+2qhIdkCATnCrLn30tf6\na2G4OqbF9RVWLG1C9/X0NdIjV17zWG+l+O2a0j+zYINSCti4//Bn+XiRUrQu\nyUslXS7nlMLXFyqB98qUgY6C35fRHZx9Dp5NP1ZdxfTJVwKHw+uoeDgJ1whO\nZjanV+++7M1YNiDaW6XB4Mw2nmqJOmesgZftdRUFLCKImwAhjZKNtmFgVnKY\nh1eqHAFS1GBEI5RxfixjwNif3rgmUwSn6MzBXfsXizlwXJ3it+qWNZ53Ye2X\nWPclqqvk+lrg2WeKFNjb2lx415HoHf1gKtzLCU4/jXrncXDdmzj4C5qQKsyx\na8hqdQGBHjllzSRAhgwGHXlSICx0HZnTx2BLSU9RpPZFXTVg7I8eD1dtmFUx\niZiQU/IBdk7S3zLnlV5TmgVp5+t69QhJHr3BWi2y2RjXvxy9bi7XAKpfMl5p\na+rb\r\n=bewW\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/mergeConflictMain","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","browser":"./dist/browser/mergeConflictMain","engines":{"vscode":"^1.5.0"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","_hasShrinkwrap":false,"readmeFilename":"README.md","activationEvents":["*"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.03c38e6702_1604710172403_0.22773531537821","host":"s3://npm-registry-packages"}},"0.3.0-next.a2963771d1":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.a2963771d1","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.a2963771d1","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"d98546266b9d573e370dc69004da835a795edfdc","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.a2963771d1.tgz","fileCount":12,"integrity":"sha512-jqeInxSHOaQA0eJ4tD1kLeVuFpja4Cb3S6KMF48mUZHuwu7Jm9dLemWyA3KYteg3mHxS0U/KEfBbqljaNVRScg==","signatures":[{"sig":"MEYCIQDyN+zRl/MLsORwkWKOc/pOFYxNoSKQ7MGFmdvtuYfFIgIhAOcAv4fC/1pANSpYvG17Gjm6QUpo+i2rTYDQGESx2xA+","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":106246,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.13\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJfp0CTCRA9TVsSAnZWagAAbl8P/jRZ2bYIokXRiJ91lWdq\n9fafQuM/l3ZqrS9YpY8PEmGSOmZ9VIAxWC50uv7X/EOf4YOxsAzGZ/Kz3YQ+\n2FTbANF3CA5etsgigZ981WVA/jTSJLSilHzOijIeFGpj0mmFsmokYNySZqvm\nWoZZJtChHfPoFm76En1fmMrw0qqBcojCyDtFE4795ZLsYAbBDZylTVgcCDSK\nrh150yyvYxRhGDVeC7m9xVqBVZFzShdV91JQVw/EGeuMMgojbF6OS07bTKNR\nu5T9STb4EWH1IOQvdJILvPz4hR84+dq7v1PCFRZsyWZNowrs594RdGzC+Bk2\n5n31VFCBI7Ku4rm/EZltNMYhSYE0K6ITWbbnMcOcZwFch6PpLZiZ93GnvaYE\njgBw6XKgyhP7KPM/wyh0Hl+QyDUV+hZh0XHLMGCMVTOSwi+szMlCgLzYi7bB\njOb3l/KhY+51OkGSruWmaQ6r35jiI3z416+FdjdVgYgbBrmJJMe804ioIEcK\nVhf8DXO5hcfrBhE9YfryRjyqiQtec6Ojf+b/kCFrRPjVbG0Zt8HIwtQSJg3x\nus0hOK5k+TU4IqZbTcDIZVWKbOUR4tjIqZeU78U9tLVA8+TX0ClY/mSoFm/m\nn/oqAuX3Ga1k+CUo3R9uN8obogHsscFSC2ruVpOW8b1Wr7Put6FPdEj3jCkU\nf9Qp\r\n=2mKv\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/mergeConflictMain","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","browser":"./dist/browser/mergeConflictMain","engines":{"vscode":"^1.5.0"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","_hasShrinkwrap":false,"readmeFilename":"README.md","activationEvents":["*"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.a2963771d1_1604796562645_0.5308471420334286","host":"s3://npm-registry-packages"}},"0.3.0-next.148b85862a":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.148b85862a","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.148b85862a","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"7bfae883ccb50a290b5c76f1d2af65a1364be44a","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.148b85862a.tgz","fileCount":12,"integrity":"sha512-da321faxXdYbl671QBxFCUm4ZjmHqgNDcXl/InTsl21Z2GF6A+aNnkDZuUWSszbO41R3w4cX0VqYXqnYnVba9g==","signatures":[{"sig":"MEUCIQCFODzVBbmskBAAFTQSaKs7ObW3p5eamfseM5kHvuPghQIgNYAbHF6ezUKCUzQMDUDAM4YyQbLnB8aMsKhXvILsWoU=","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":106246,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.13\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJfqJLZCRA9TVsSAnZWagAA03cP/jgoDV/ZjHr10EF3EvTU\nd2aZia2ejyn2kuhofCp1LYuCkhdRoDDlX7Wx3NUp4ROi7QRUppFGCuFif/Ad\nmzyRyOE2Y9ZhMdY2FvYu+SQrf1oLCz6RN+6O/S3Yios1P+YZYdX6a2mrRn9J\nt8Cbs2WDEmKuy9PhdRwZ9Y5bVYD6Lb5JnSMPtvJ5Ow8EKBLgyPLQJHWGiXZ8\nFYzw6FlfAUG8m7HhuYrwk2RzDJGSYzvxQpKwAZaDCyCd2ZydK+JNmu4ERgzV\n8KYlm7uZGGuYPhAE+SraelkBHH4jbBAwkuQghNZXGGoD/ecUtb5f4sy6LfK7\n7oX/5kcFOUG+hlKbue7SJSTVgJ6wbmtr2104kFuR6oCntuuN4sS2lzPLC31y\nHw8LoajwP/PR+IKLndvXPVGYZ1SDGe+W88K4LB7SqKlTA7LGNcbhcqSRFE5K\njuQTYgtGKaNTfC23d4m93C8qIKyRKbJpIJVxnoMS0rQyneUnGl9Uvw7LEET6\nuyj6lVQ1F8tYiogWuqI4dLVrOslZGEAQCIN0JwwZGv1xyujJyZT+PkGxiOVQ\nFNYLwb8NgQnIT9Q5n/h6Y5VDsnhA2fzN1edykMPCTaSVN90NUxUQH00ANGs3\nn60BgdZYGK/uZRAxDhitabWzmG0SbptRsmAG7V7LTTlmCcR+y82hIf2b3NYn\n8Lzx\r\n=h5U+\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/mergeConflictMain","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","browser":"./dist/browser/mergeConflictMain","engines":{"vscode":"^1.5.0"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","_hasShrinkwrap":false,"readmeFilename":"README.md","activationEvents":["*"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.148b85862a_1604883161446_0.43138057396899954","host":"s3://npm-registry-packages"}},"0.3.0-next.c9bebe2cc9":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.c9bebe2cc9","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.c9bebe2cc9","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"df9745f2fed80875fa757651ed7878dcd5d3b760","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.c9bebe2cc9.tgz","fileCount":12,"integrity":"sha512-iRrkpwC4tvhWpuYdq5sjlAk8qJgg/PfoM+DlV/ECXAJ38o5UQmYEa9fu5qiep9HQisZaKrOtaJOi/cxJ9WO2iQ==","signatures":[{"sig":"MEUCIDje0Xnp2Ozc9yvi2/TMESD/3nhMQ15qDwi+9aaGpBd4AiEAoA6Vw7EGdxvAzfgmJDfHHGy4tB5HXB2w7xDBp3Nxml0=","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":106246,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.13\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJfqeOhCRA9TVsSAnZWagAAf5QP/R8d6oJQIywyqhXKKWi3\n9L2rB4MOIKOJi9d5CKsYQt6D6pfpsSoKaoO0jtDVTRVcgc7Egthgt/5nvmkL\nNW+dbw4rDkhucvC3IMfVagVXaslZ/JFHsyFzoBWmstU8lQekrqPYNZ97j4Ya\nOHv05An3zA0/a3JVHlXkUQZbYS6/NQVZlR4XIKPVv7/IdbQlCqmu8KzaVsBp\n5D3z6bLULaK3v5IcZMMtI3qhwfeEPct1pw7fix+TGW/laWOZL1KefCDPOJ0E\n1v8/wwEKG2qlTaVR2nb+1x7YU53d/bhmDIS5k2GHZox0dQ594JL5xU+l18wk\n3MifarcLqKJHF5bcFYdfZ7yBrIOvaTSW4lsft63zmK/hmiR9tv9VVIInvJ6P\nA0ajKPGnR2ylglcvvmkNsXChVv3sQzgja4vW4bv8oDH4Fo8VUi5InbwCYNN5\nmUbkLN1+NnTDVpKKZ+UxupDzzf3cHExLxPLVWQrz2EN0MORnQOkV5fZjPPCl\nxIJKwpJkzYu3gIIghcf/T9U/a7nJfMHz95/fXBhhAjasNnQ+2LE+Qo5q0a6Q\nxrorDDSnPxV1Ca02Tz3uImnfi2vZklb3YEH+2V4CI7Rel7ud4v+RTS6fAEEJ\ndfQIiSxYFQliHHnApdKqPbVfEfV4ku44144xzhAlUal2Fy39BZRYM8iCq66n\nJ/U+\r\n=nUNU\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/mergeConflictMain","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","browser":"./dist/browser/mergeConflictMain","engines":{"vscode":"^1.5.0"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","_hasShrinkwrap":false,"readmeFilename":"README.md","activationEvents":["*"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.c9bebe2cc9_1604969377209_0.6631309195314885","host":"s3://npm-registry-packages"}},"0.3.0-next.a856e60a0c":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.a856e60a0c","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.a856e60a0c","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"87a411e577cfb98cf9f3b76b3e7eb0b6bf313a5d","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.a856e60a0c.tgz","fileCount":12,"integrity":"sha512-PFguskCA2D1xNMmzNmFa2ZoqnWzAFPi5uZvwKljXkcdUp1t6l2qUYlDK2vno4Xu9ZadY0bg6TRlR3mxjw/Wnjw==","signatures":[{"sig":"MEYCIQDWDvrGFpkIrmwRcErWZ+P7oRk74mwikvYVYelU4efxTgIhAIVg8KMETuWWYtVdLPSgT92IKhE+dafaPBJ0y8UcPwuA","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":106246,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.13\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJfqzNvCRA9TVsSAnZWagAAXCIQAKTzSUF+zCtRi7hd0bfh\n/PrGplvOJ5p2ZaY6IPiktFW4gL+Vt/GmUjMluAzVACFU4MHgkdD38ehyhFNR\nIXov+qet+SGUEZ+PDVM84e4PofmHfnhpsxvcMHGTFGtlWbC8jIicySwmINzj\nGU7sTZ/tL2dViaG/xpaheyfDDZxt4wib11lLyBwwUfaNjo7QeuUMuqPsiVXb\nCcrdqLSu2vxXQQ7UQdoV70eCii7+w7jcgtR2Ra6evXD6GrWlwiNMlp0B3yQg\na12Qk+CJVSaPUJ6+NbHaAczDatuPrZ0bo2MNYvjabH34IETK13wb6z/3BVuv\nzuc6opjCyAH/K3583p62FQpzWfkbq7yMAPXARSCw5zItJWngMU5uyh+XKfcc\nBNFGsAh9qFdLIahdhvIUwzvFdvyi+tsIZ3fWlu8CmrG1X81GU1YVDuxGHAjt\nSftLKIO30gzJpWYn9YiCN8RzFqrm1HSctKm6soVi2uEegLztiPy+iq7k/vsM\nH813uohAW5U+KJu2jtlo8Icth2o6Uu3MhELnpCXCb1uWNGCmhHH3EsZ4vONb\nfcE+Yif3XJds/ySl8ifIiYH+/g3x8sBT17yjdD9ZuM1J8gCPNmYjj4vVeyNx\nT1pO2DPBEYMGqkurBy/MZkwPMLRuROz3xfAilQbUMg3x0D/5Yuifv3eeJwhe\nRHmF\r\n=05F+\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/mergeConflictMain","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","browser":"./dist/browser/mergeConflictMain","engines":{"vscode":"^1.5.0"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","_hasShrinkwrap":false,"readmeFilename":"README.md","activationEvents":["*"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.a856e60a0c_1605055343269_0.9156819025743776","host":"s3://npm-registry-packages"}},"0.3.0-next.67817c33a1":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.67817c33a1","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.67817c33a1","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"c4c981b741836d7f40b7531092c8084c97a6d75c","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.67817c33a1.tgz","fileCount":12,"integrity":"sha512-MwDBJTWfSp/+vUBjV0tKMOlaXqLqpoxRvE/SQ0KGycWchLsYfLgjIOBDd4XGwksz8vRL5kIPvRSkFp20hi7ZrA==","signatures":[{"sig":"MEUCIHfWW52mVRrY34uDoVlDL70YOUKo4zXloTnSYbyeHqeMAiEAhgk9Q7a9+o0zgI4e52tasAA14YiaqORraNRYPRb9A0s=","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":106246,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.13\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJfrIZTCRA9TVsSAnZWagAAhg0P/1xPlckIlG8X0sGaGTW8\nZMyZcIwOoYU1mEyeDDfbxnjp4BRaKtLTf4mpZd5iKF0JN5mEYbNrUKxJySF5\nzqxImFyj1woCa/qejMExvZx+SKbwKMh/e5K95Z37UlBK9GFaFYn8sKss6eB8\nRpXade28whtHgiZ4kdCmyo+PYO7LFGoyX9Nn1mKFVLtTNtjvqVQU988PrcG8\nS3yXhexO6aul2V9hArjrn7EJUrb/aRN5kApFxZtg+Q1IgtzMYinZdYZ2b3lh\nACQbhy4f0DKK+46urfg5J1u31MNdBFoihNhinkwpX7HgtY/qXm69igl+G+lR\nEnEQQBVNv0QZZQ/cwINMmhFVjh75HKm9yot62zSQuizIktIxzzWA25SVFw81\ndjxMbmM92OK3qZD1W2hby8ZW0YRfXqubqBYVilhnLTlIJAtC4Qt2MvPDB6R5\nLdAnUNl91I6b8kyd2Y9ITlVZ+PLebe9e11wffbf6BMjjlcT29E0u9H27i2d/\nLijzsOIX7yVBPExcJpCoul0jsc4XCUzfkxnt51oyHvedrfkUC2RRTGbtJ2WN\ntDaTGzk9IDIL2BAE4vBWNgv1Glo0VGbtCgD9szMlPD8xJUGp1EPSpJTvR8YV\nnvvax7I/QqV9heRfdBB8snvxwe8qAgOuPRS9syxEXUTsB74D2caUhm0uCQ6k\nloPc\r\n=96o/\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/mergeConflictMain","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","browser":"./dist/browser/mergeConflictMain","engines":{"vscode":"^1.5.0"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","_hasShrinkwrap":false,"readmeFilename":"README.md","activationEvents":["*"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.67817c33a1_1605142099191_0.3863525136641264","host":"s3://npm-registry-packages"}},"0.3.0-next.f47b588736":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.f47b588736","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.f47b588736","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"b345e7e999e48772dee55d5af8c06d27a7cc9362","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.f47b588736.tgz","fileCount":12,"integrity":"sha512-xiIsFaqu8V0gyB9y+bDA0K+dQgCoDkPA7YaBm6fWcYigPD3Tj13DSZRqkTon7At4/0ptSy2h2/dHZYxIqHnlMg==","signatures":[{"sig":"MEYCIQDQDlk0/A3jDT5gIPEBvbIsNN2jGPhkyYy8QXKXrDVsJgIhAPLN8yVQ0bcLZcRvV9QHxxbDno/5PHT8eax+YoZsXSKS","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":106246,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.13\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJfrddzCRA9TVsSAnZWagAAHxoP/jkyak4mf4x9E2k+zizk\nY3ukwrDWva6fZ4iOGvnnuLEt2JaEq91f9IudmRzf1biCk0TJ202M+I8QgaMu\nnoGeVBTS23CV66NvNAD9y4CHrNaRYUeTJdirG5nZfsECENAbpnP74yAovxaX\noTBI09z6+VFufMR5axTQ0J+eKEPNi0R5UpSAcqXarzHdLnD7dXsYnfAQ1Ox8\nd2FRHan+9db9fdcoryaRXUBAYB0jlv3Hc5aPTpabEglxnnB79gGBx1uzHcNJ\njVcR9CluPIcZjGXKbaGt2Ze08CD/SSSiUDvTow7B4PuXLvuHYJHBuJfc4j0i\nYb+UK9OUPV9EdEfQLE70UPw8IY1cTj1m1ze8R2HOT0BA6NZosy3haPnerwx/\nKY0eH4LGKw1Yx3rKtnQn1+IVS9a2TBZjTU3WyKCBP95HbUQbXLhCZnvrvyg0\n0EITNMcGpAVryrRbUZ/8kuRTZORfeOYIi5CnqPesf+lD85u8vEbr8tPUhwyf\nojDdXxUoa4Q7NSsK7z3GCdgRzIvJt/qa204LZaYRwiCxNdb/XD4NhrqEtEId\nNkKDvwh3TwX6W/81Gi8FnxdYDEPPrnbTXOu+/xoOovyDn/n1eFErtsrcdNmj\nsJ+su3lHxOop20RAGZrqyb/DnNei5r6Zk+tPzNQYPkCjU59qVqMkiKFWnT+v\np5Nx\r\n=zYfd\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/mergeConflictMain","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","browser":"./dist/browser/mergeConflictMain","engines":{"vscode":"^1.5.0"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","_hasShrinkwrap":false,"readmeFilename":"README.md","activationEvents":["*"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.f47b588736_1605228402508_0.7751422330935387","host":"s3://npm-registry-packages"}},"0.3.0-next.5afc5cd160":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.5afc5cd160","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.5afc5cd160","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"1cb57f3e99fb49766e0c25e27da6058b43c99b63","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.5afc5cd160.tgz","fileCount":12,"integrity":"sha512-+iZnaCEKN8bVkmxwOMukZE+arnyfM8MCorpQVtN1pm/RuAZHnYcyq1/C645FbLlAbB27ApfvgxMkxLxfr7XADA==","signatures":[{"sig":"MEUCIQC3UwVPoz9PrtcGUtRel5w0B8M/+WaTqqq90Lj5sRP06gIgEAwaOejjzdqappCxwMoGp8dax2PAwpnf8ZoGg34PJpg=","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":106246,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.13\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJfrylACRA9TVsSAnZWagAAAAsP/2Q6ftKBubJgIlotCkvI\nJ4VoFpdddLximjYPnKuY/XE39lma3lw0MfS3USumaurr5tGtq0HIy5qy6YQy\nafchufHUP/hbIwIIWc45NvONmA+vkhgCtgsPnXHCagvdBAS5657pNYfyLYQX\nsOsbKBAApRzuV21Rp4rNze2lu+FvvWUDXbr0xytaRwzyyuQTb+Jjyk/1V6P/\nzkUuccdDD2ty9yoT8maYJxUtVx/Et/YvxyKGh5OoRTAL34K9ZRV1x0KH0DCV\nu+IUwI4ZgnTZp3NwUGyvudEJQr9rGlDtlVD+b6r1+m22W1dqyGaeATVZ4p5O\nsa2MQDSYZmjWXFyYNtWEVLOeGXw0Byi5q99bTk3uBKwozFyxpxA5Rf/I58JA\nljb7kxVnAInah2id2O4YwxWXgZ7ejcBxemo17SB1zLMWF9NlovCeqRViau4L\nWxUo2JIjfY2Wc/Uq2veiOzIDuxpC8hyLpnRedjH5+t0CoiQ6TUoGpqS21cIH\nsSi2d2WSy9XbQZnWX/tQw2w/20igLh4fIt0ol3EUDRdInfcRRtn6xL6VTrve\nhchlQnl/zPkDgUhHJhTphhd2SnsVzfxn0AWR8ZVNb9akwHaQIbXoYkUDf3Wj\n5M4O/V3CuUaunFOuvKpPQyIjYeQU4ref88RhtoMpM218iHjgNkFidGMdPAHH\nBIN1\r\n=McRL\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/mergeConflictMain","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","browser":"./dist/browser/mergeConflictMain","engines":{"vscode":"^1.5.0"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","_hasShrinkwrap":false,"readmeFilename":"README.md","activationEvents":["*"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.5afc5cd160_1605314879813_0.5301351462818364","host":"s3://npm-registry-packages"}},"0.3.0-next.46ff33b6b6":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.46ff33b6b6","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.46ff33b6b6","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"77fb51cb86eba7d17a9ed9bf5792fc7b2fa07285","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.46ff33b6b6.tgz","fileCount":12,"integrity":"sha512-TUfRHw1zXeRZAZKVs9oX0azmyxMGIvC0kMjv13dyOOBJq8BdN5qU+If4TtlSf6ZVfCiIOjJhx6cZPXllJb9UAg==","signatures":[{"sig":"MEUCIQDrizdX8l6BrRDmsN6R1UlvcZsbgI5xUXMO67DMKTEDCAIgdsufD6jpDMKyOMcmnwu6boYSgAJ1wM743rkP9027nVI=","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":106246,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.13\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJfscxFCRA9TVsSAnZWagAAlDUP/RastwK2smF9HIEh+BnN\nuutYcfHzIOsH/O3/IETZFNpJfDzw3gqG+3Enuk//+JxPv68MaOJB+/bo9IKr\nLxy/od2SnNwGxAu/s15NGMrNMIqIsYwFTH1x0wXeOCFIgxBWO920Egh7fQkO\nN+b4HpJCHM/dmfh8dTCUhDMJz6Ct/q0BudEyH/KfbHaIrOZ4sw277L52U3GL\nKGkKJ8ZPBs4P2VYSB1s55RK8aXk3b6x5zanLASRH3GkL7D993o0JPErLK6ao\nE1MosnxmiMMf4V3vtXwIpI9uBZHskDe4NF5ZC4i8VNYzCtiBiJ/W5ya3t1fi\njHKGYzCXu8LWzMMrDljAT0qvaV9Q0OnDHcjlNxgQeNJFys1DcFhcbiNWYM7S\n+cz+VOS62CrUfrm91tzczF/LA/LUNMLV+CxaoKydPxowBZbg2S++OfKL+olZ\ntPntTQPqGQWV7WYZeUtOdD6LTzAImSypAwK6GZFH7PiRNo0+kDmaQY8x7Jec\nxJNzbjqW0UyRt5tkulfcgA17UcIl4fsMf8hS74VJwJ1GcCnxF/n78bjBC1CT\n7yN7YAiv8270t6JXa2VPYijPiwoinD6RpSQAVm5osvLJ267AKJMznktb8oOH\nasbfXcZPXYUCksi6pNg6VBTQRrDkDIwKiuf9vlsUCorvNpO4yQVawjyMZa/h\nJMIs\r\n=nETD\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/mergeConflictMain","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","browser":"./dist/browser/mergeConflictMain","engines":{"vscode":"^1.5.0"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","_hasShrinkwrap":false,"readmeFilename":"README.md","activationEvents":["*"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.46ff33b6b6_1605487684880_0.4644287070177442","host":"s3://npm-registry-packages"}},"0.3.0-next.d19c7c52fd":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.d19c7c52fd","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.d19c7c52fd","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"1cb201a94f540ec5ac6b1f4ac618016dded618ef","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.d19c7c52fd.tgz","fileCount":12,"integrity":"sha512-iOljwHdIDgx10AAE/oHLXzY7j3H2W6muOKBFz/kqNKNURTQHqLzVKzfZa1RYSG0Eg39hDgga5/13HCNQIfWZBw==","signatures":[{"sig":"MEQCIHMhEmm5vB10mOLOWKANdolj18adrJZA4dKFbyz3mpvdAiBO1yl4pZGpUr+U1TSaM0xVI1JTnwEX0W/NQ6Wx8Wpp8g==","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":106246,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.13\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJfsx2+CRA9TVsSAnZWagAABuYP/2imCY1uo1ZjdGCtUZby\n0wg4zp8X5ZQswiVUZor34G0Qii73nQXYDUs796hedpJClyXrpPzkxE5CaMKk\nYkuGyI6l76JzKuz2UAykUHrVXbyM8N3wLouAUtZfhIGFbMn4R3gxwzZFYLGw\nIT2vpepZpC164prlF1r1rUpOC1hbpjVKAZ7X24B4CZIulp53JbkM5s26tu2N\neMP2jg10j/lnPQ0Vx0H9V61BgFvE2ip/lDotFyBQepgPPoOEPtBicl09PGHg\nrkguQuXCaGj0lFjcSyZL8QxGKfvcbyJgAr5PNtwGPmXb5PFXGIG6ixP67cjV\ngBPVOPcbD2U6hwFcWC2M/ezPrx1rgB4hsjSpsbYIq07kSmvAK8jt0o5nfu4O\n4IDK+1CTyWL2YEQ+PTSrHiFXZmo93wypmqG3L1ksBX4nUiWPfm5Tje2KoYmn\nqKFYB/aMJKavgP/Hu4bjemPy9cj5YekIdan1slr4oyteFDqUDUjY4Buajgs8\nJnXZ2ALFk/uM5YLiHkUF4XlbxZosJvBPYA3DVv/xo9QMW675p2ResMiH7HsT\nGPnMnKWLNI20Q0bXaG1YiKC8x9pAceIrZ5oQrX/6hQ4ipGfKgknkXh3A8rD+\ncTgA4p+TVBqiPQe1zSc3FBsU5ZoT/WHNdmMBEdhlue66hluAZ8NyhRsNw7uq\noX5l\r\n=q8d2\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/mergeConflictMain","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","browser":"./dist/browser/mergeConflictMain","engines":{"vscode":"^1.5.0"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","_hasShrinkwrap":false,"readmeFilename":"README.md","activationEvents":["*"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.d19c7c52fd_1605574078361_0.3546863868276169","host":"s3://npm-registry-packages"}},"0.3.0-next.d21a51c233":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.d21a51c233","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.d21a51c233","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"9fb107ea8448a028439f13eae0e3c5d0a1483733","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.d21a51c233.tgz","fileCount":12,"integrity":"sha512-q9hYBsITCuxUV0EEYxXdS5WYgFPnCc+DDERxKeJNYtaxmTx2q9U/VexDstLaJyDxzKfz+8yxFBByn7PhKXQcig==","signatures":[{"sig":"MEUCIAa1d716xtf/5M+Ex1EXxd/TKLyQdzZUa3+sJqnkgp02AiEA0aLhXa0KN0Kyf5uFvl4qI+Ist/731lrFlTGXUbsfrl4=","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":106246,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.13\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJftG9OCRA9TVsSAnZWagAAY9AP/RJn3j0lWCktqr3DjjPZ\ny2VPwtv7/M8DuFfE9p7QroWELs35WijVDBJ8DzSk25PgCBg7VN2P/bYrRxNI\n7eIHwS8Sjqqw3teLi4e9ByOTKImauOIaA4j8v/WuozxzpCKpVukDq65tsoJs\nmYzlYX8KuEquqZNbMK4f71n0EGhofFwgHktZjkxcrYneCfcgIZN3TCc1Jxgv\n6ndQnutu2og+rhwaQA7LXly9BxwsOfIB66hrYbHckdR5EyJXof7Vqk5T+Tl2\nHENuhb/ObGPgLtphA2EMxnDt9tBF7UqCOg6KrqdcmLrAy1ncNU9N+F92Z/6U\nrFgGnq4agsv88FYdTwmDue6ToANtuaYw7oPuBugL8auyaoB7APqWB0wei9qz\nMvb99n3N6gPwy96Nuwm275+PQc2OCzknAo9SFYyecII9URTJKqY8vTgmWDUh\nDhNOdmgnKEVIG3gvhoAA/0YQKDvjN/Xdb01Lt+0074YM3q9IZ/xeSaTKN54/\nwnRGtEghZsqB7IspsP3wrZ4oDJKZLzHY51aALxXgyAktef/4Q43HgURqDcUJ\nfbj9CODokob1lkQYelXrrnoUOLjwOOZD++uvN57qcPT1oWVKar4ehHGojBhn\nvdegRi7INttBHeEwpsPu4815u094D4TXtD8I4RH85/qMBxvPid099nAeaTko\nI7gh\r\n=Jt3h\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/mergeConflictMain","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","browser":"./dist/browser/mergeConflictMain","engines":{"vscode":"^1.5.0"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","_hasShrinkwrap":false,"readmeFilename":"README.md","activationEvents":["*"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.d21a51c233_1605660494494_0.5438677189197878","host":"s3://npm-registry-packages"}},"0.3.0-next.b1bc453c55":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.b1bc453c55","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.b1bc453c55","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"2f3a555fe351da554b14193f2e10843c13505514","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.b1bc453c55.tgz","fileCount":12,"integrity":"sha512-b5fIJnOhU+6qDvGwiW1/kkczfeRiCcDr2+1weAOsLwmXzA4nQylZHqDjzPFT47pFE1HJtSocnFAHFQYcUUaM/g==","signatures":[{"sig":"MEUCIE/fVYdX603Ki83Ml4S9oS1+MaCYHqGfBqwEX3Y3dGFBAiEA+hvLOdT3fN5iRN2oS+nsCIUkhAE8TNZzlk/0/diCjpo=","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":106246,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.13\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJftcFPCRA9TVsSAnZWagAAPmYP/icQJH/UTSMZiA1GTUsH\nZTj4PY+boKAKZVuNWy677Af5tytRasW5k66jDI0+up/KdwHtbXUq7Q4c/TTW\nkcvPbthwv8WVyExRUL1pId1nG4E027jbHh3e5OViitRyCM959usq4sE5Vmsc\nh/C39ZE+rtzcg9R4CGSsfipBw/YHnO7uEqVqZwN+Juudx2ik87Adb2tQAbV0\nVITelmccYX5kTIAw4KACxRb/DmCYW8WzfSzq/IBfxz0c+dT4nC3huB55UsgR\n4kCGy5S5gXwoit1m6yET5R8Orw2LgKDWwp8khs/5178PQ9XswQ791B1ZnAcu\nzK/LrIOhKlGq8N3nfCY6kxxp9SRcoVWhWse1P+b7HIJ3cpkj8ykVTafPZqRW\nWDcPaBgZNqYSbZcuiX9rRNyOVZq3vPQNFLQZgxWi8IEBfRL3k/+EWIt4j9Kg\nKGWzcTcivEbyopSSXIRVpRrEix84qv5wxBKDoDplysmAbnu/NFYrH+9Gdxjd\nLHBVSykCrYqojYpmTYb33RcuiXkSZ8iu+9Pt/5YAkbhtqbUJlsTOjcrEs6+c\nLbPCzq2ygISEXlxIV+b/w/W3KPxRc++NTFAhKvEyM22DyeNsiJ5xwynYp1OO\ny17ougJATmwboH7TsU6x50VS1gDl3tERaTkcU2UUv6hFbQgN3woCie4o26cn\n3qBP\r\n=MQVd\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/mergeConflictMain","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","browser":"./dist/browser/mergeConflictMain","engines":{"vscode":"^1.5.0"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","_hasShrinkwrap":false,"readmeFilename":"README.md","activationEvents":["*"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.b1bc453c55_1605747022561_0.48165158895874893","host":"s3://npm-registry-packages"}},"0.3.0-next.ea4d99921c":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.ea4d99921c","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.ea4d99921c","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"fe45b6607673d74c2350cf052890e1b390b0a095","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.ea4d99921c.tgz","fileCount":12,"integrity":"sha512-9m3ml6y4uzE5hn23j7YyfX3aS+C4GG793SsvBqzryPcBQ/gc19lQR2skqsiNHUsPsuzhD79htxHENWtQChCABw==","signatures":[{"sig":"MEUCID9P1Vahy+CtjEYK1SMJgnt5hFy2TMpSPU5EWdYGXYr1AiEA8Q1jNaiXz4Hr6roxj6kKcDwxZ5lhkFjf2yFu0A2DOY0=","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":106246,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.13\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJftxL4CRA9TVsSAnZWagAARywP/3twZF1TFBp2uxe4ec1l\nd2W0WcqNl4ebSeLdMYnrq2ojmNT50X8ofTx1gQnvs187awKJsWSQfcq6VOOE\nezHzBXNmM2wqsF/B/R59j7TYueIGFm0y+0XVQxgUoFKJkaZGOmN2wktlkamA\nSCT57+quan2AT6ocxUAoyH7Ia4bWoDyUw7Kd/3usat2pnVUlwY/QMSW/UpQk\nZdiWWrq3H+Ki10KPWUFb7AVcXeZVyD3skCiCJdurvmBwRd0+ksv0XCJnuEJB\nM7XDWvYEHG7UtSImsOgV/TVK0YGhmPnYu6anmQ1xaRmU7+AHFmfF0qW4KW9y\nje2PooanJ5LZE6nUqAIGLz/Ndi7azQL1UHDYc8NU+I3NIRojDUxAqtYGPcrG\nMP0ktjXBuOqU3gc63liliPpW+2c0bEphIQ7lhhERh/6V8tRW/xSGbA897N66\nU27t/CCqYu+7Z4IPC5RMWBtOuqNILJ+MJRxpO77sW/KMdRoIsPiAlLRoilOh\nZlyem3ELm7QivPn28Vj3wzAeCdkzryKpEpiZuqtOJtZpUJWp84x7cNWj+rFx\nY5HuiriyVvd70qZpWqU58iJdh7256R1pFDs4yD34yFDwAEwjcJNtowBrjxY+\n3k7MUXZQ7JZiRJoWIkHxDLcN3foH6hJMSagACRbTCY8h5/PDr6JsXGrmO0uK\nqahl\r\n=T4f+\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/mergeConflictMain","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","browser":"./dist/browser/mergeConflictMain","engines":{"vscode":"^1.5.0"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","_hasShrinkwrap":false,"readmeFilename":"README.md","activationEvents":["*"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.ea4d99921c_1605833463838_0.6579736494588762","host":"s3://npm-registry-packages"}},"0.3.0-next.fb80c0e44a":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.fb80c0e44a","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.fb80c0e44a","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"fa6934417aa0db2f053d570dbc73eee58c856526","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.fb80c0e44a.tgz","fileCount":12,"integrity":"sha512-1rQ0EUqHiaov1e+AehKRQ8VRtvPbQDVyE6z9Gg+5EwtHWJ0hEIUB9uSrPuqgAfHPuQoh4qRG+NWB5YE8deDZsg==","signatures":[{"sig":"MEUCIAQ+JsjWfTe4RyPGGq5z17694TN8+k6zK8JW7QqcMSe/AiEA8rzndyur3cihD1WJ4AFhurCOJq52xGQjFIVYN/eNr9A=","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":106246,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.13\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJfuGROCRA9TVsSAnZWagAAx8gP/1k9iikIylW187GlUbs6\nYkAjolcAsKjd2MJsXK0LYJ2gN4EZ/bIRIAUlHoEisXejgZs0xuFUWsDGBrx9\nT8ZXTq81sl7Wlgg1ot1YL4Sz3c5widfZaaNuyIcpss5+byBzbDc+WoUml9k9\nCqsFYX9hyDjcT1gLusAEseFLF1GKFC7c41Huy/8xQrrF0uMoXtAfWy8hY/co\nIM6SO5bOuXuTHZBmBrU5DcsNSKg1TYncV1MsSS1dS3kQxw/3EPWzmg0XSpg/\nccywyf+uwEdGCP/jp7Oy6AQFzwzX8oJ5eWOcAHkJbH6nbXakmX2I9RgMuyZD\nK9IaXg+iWcrq6aFHpmrd4LVdBd46Gr8HKLq24sSfXlDOHdudkLaLFkD/pQKB\nJx1AYdbqd/yDhRuc1EVpn6NnX+9WxJoIQd+RDcslvKsNGueL0XqVymQgLOR8\nZVMqF/kiXGYsaomXEQm84SSqkibvPtHsE9Z7DauGmUaD6aj6OqsDRV7vzTKk\nXBriaM3TqcDW/Lol8qyw/B62RHLXxcSD7jvST9eEkl2Ej6wTiO634IA8YDIG\nPgJ5ns2ZpDpEzwqSDqIO+oy6o7ICic3PToRFdZLya81TG88OR7s/bFozODWy\nw7vAoVKXMHBbGpp8KWS9yGB3nDVAsXVeubZVzrrinlnm2H+MUjkA36/pvIWN\nxL7H\r\n=0hxF\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/mergeConflictMain","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","browser":"./dist/browser/mergeConflictMain","engines":{"vscode":"^1.5.0"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","_hasShrinkwrap":false,"readmeFilename":"README.md","activationEvents":["*"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.fb80c0e44a_1605919822156_0.6440935023392926","host":"s3://npm-registry-packages"}},"0.3.0-next.986e1248f6":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.986e1248f6","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.986e1248f6","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"81855b1f7992b7c3276db5f64a05b8ec3bb45700","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.986e1248f6.tgz","fileCount":12,"integrity":"sha512-PG1LgXdPsyIIt9/CWJjKWWMuqdVHhGK6rRRlGwO3f39MpD3ZDCLsOCygJ5naIgT9ITU+eXgfXY5LAL+1VGIDHw==","signatures":[{"sig":"MEQCIDYNY0o/eBbXCY2r3uwyqnJSvNdS0H2GBuxch8HJKCLDAiAu6aROzlbx1fD8RTNDl2HucXjN9vQcYkCk5WNw7zJ4bA==","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":106246,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.13\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJfuwfTCRA9TVsSAnZWagAAhBUQAJ59XGMcqEtWiWtgMYkq\neFomElPNrwhmjYIUUmys+F1vYJnuKCvyCimEyWg6CwbihRs5ZxzlGDkGeGiX\nnBICpGcAcK7ZFD2/RqCxz+xqoli8u4chNxgj1sQM1NyfwriRyWtMjcOqn94Q\n5w4m1OjOrSkFnnJILklK4cJrl4yjk+JeKaR/Qifrarpduv08CSeg89j2y7/j\n2jzjhHJyEL2C5GJXxPAaF1O6KHM6MiN5sVZDMEBek0QPmJ+jioFe1c7N7q1P\nYoglp4XEoIzvHydNiHL+LBuaKmGjX9SfZP9YtquXzgr6S+zs7v60/QRRN8P5\nCp7OxpYIZQ7gvXKLxuCyrNQeExjDBimXGufxXOTrnvee6t2DprD32H3apnU7\nFmpI42kDxMa8pqU4uBuoQMhKNUSAbsZbKwDcIAd94DPnwzVVWR1pZmmyLb8T\nHVLvwbZUACy9aFclYiAlRD7YS4SXg+YZg1sd4W2mjeOGHu6ixAV71LXuh86Z\noJl8uM460/2Dh4Qvjsb4oax0MQDFbSm90bmRAM2Jxka9M4J3n0ryvn8Cm42K\nSfr/D+fed+9epEpE7MXIbrbTCDvCiwNCO5cc+hrcrdhaE+2OEB7X5Oqf+uJc\n2VrBMMPXsWNNV46MErHgxtT649YuzNl7Dg30VJ62U7gCvWW+3mN9o2cEKJf3\nbUiD\r\n=AWas\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/mergeConflictMain","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","browser":"./dist/browser/mergeConflictMain","engines":{"vscode":"^1.5.0"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","_hasShrinkwrap":false,"readmeFilename":"README.md","activationEvents":["*"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.986e1248f6_1606092755331_0.8357355657907692","host":"s3://npm-registry-packages"}},"0.3.0-next.c3e1f0e02a":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.c3e1f0e02a","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.c3e1f0e02a","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"7d2a634d8eb904eecace6633e89cd9fd23133119","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.c3e1f0e02a.tgz","fileCount":12,"integrity":"sha512-F18ygyUnbIjOrjR4X6HUT/3jZ7dt6E9J30e3X6bPmhp1vx/fzO7Fn/fZbKlFqbUZ+NKTH0n+dBBm30zzCzSbFg==","signatures":[{"sig":"MEUCIHT/232+cWpU1EEGTPgK0g8oQebPfu9CBXTWvbf3eTJVAiEAg62wJv851Xgomh1mAVEo+jEyp5etqrnYuRLlYws8+Es=","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":106246,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.13\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJfvFjlCRA9TVsSAnZWagAAqDkQAIXVvH1eMh1Lxw0u0HGQ\n5RDHkWPp3ffi/KpA70ouTB/Kl5GNCXrlZkAt4BGXkRja4lhyzxaoz2CbhQmT\nRxDQbG51DcC6z2tbbAwgnIxLu9CmY1gTwWBxHjqQ7qc1VnJg0kuM9dBBkaTr\nnUfnw9lrBQAh0i2CvkLU270nBl49wb+yrGT4aVFDpJKptFPXJNbcBUVpPn3b\nseNtWE+Gd4KiBugBPvkW1aKZal2MK9a1vSuyk3aM/wg3r4etpnsPuznHZqim\n8kmETM6HFe1m7Rx88ynl0XasoLA5wIhhv4enaTeMV/0Nb73X3RlMbHWS8fAG\n5NwUoz9BPTaUA9LWpD8ixTcQXzjO14X1degZfMOCKCKVxA1XYGDp0DpEYc1Q\nTuc8PuKHWtv4NXncfpngMzDH0yf3+x1E59BhT1WzZiVfUI02ZG4IcpqEuDeA\nqc7v+lvBjgshC7CQMfLhTM96YV4eyb1rrgN/POWy97nTBNW+Z5WjScGI3nOr\nlWwtN84RCPcQY34mHDWd7vKi2o14RBmcGDkMDxKdPF0NNzYrdu9uQc0b2j+t\ncQoVrI9AqXpCgG2KEDLVb6J9QL4N4QZ2MdP9qtqsBoH1PzYw7Gy4IUy8ZK5c\nMMkl4ejqc5aOW/VJUuX9f2zb9+hgL/xxhV7NcrHkSdEkMcdHGO6d3ie2u/iw\nilCZ\r\n=zrVN\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/mergeConflictMain","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","browser":"./dist/browser/mergeConflictMain","engines":{"vscode":"^1.5.0"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","_hasShrinkwrap":false,"readmeFilename":"README.md","activationEvents":["*"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.c3e1f0e02a_1606179045126_0.8719124478240126","host":"s3://npm-registry-packages"}},"0.3.0-next.3898e2ced3":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.3898e2ced3","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.3898e2ced3","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"920beb049bfcf85e52483eeb673f845be9e202b4","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.3898e2ced3.tgz","fileCount":12,"integrity":"sha512-ABotZOaQGzzXqdcjp1P5JDDuntojcVfjsdRndCScLXjnkT4LuOmx/VvjHOYvxU0BCfO70rQ+6walXWmdjCjCAg==","signatures":[{"sig":"MEUCIFiP6RQBPHOEf988UAWMTPcWjVJp6dKVmMzpruCOCkbxAiEA6qyzMlEZ+hOnTZwucLXQS+dU1ASAG1C6pUZiRhXn1Cw=","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":106246,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.13\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJfvapgCRA9TVsSAnZWagAANz4QAKPtCeumr636BAnIMyq/\ndST+MMoVplXduHl4CiVpiZkZKtDvsXCYRGqfKwZr2pI3Q24Wp2bqk3bSaEQ9\nqqQA/vrt8Yp6PgHO15po9cQEjTssNuZlOTigdr2bFukGNYUttIkLxaGBDHMU\nhNqsNCnCoJkwjLlM7D5qTsbnDBh+C8nmeyqrGkN+cLK239ArPQnO/tGXsRkU\nlfG6qAyzFRhkNmrLhLfHhrV5lGX09lA+2bLH2O0Noemy6RZcf4QtjL1HEnjE\nUuVFTQ4LakuVeZ3Y+CHSCB6swk118x3TYMovzYv2HM+pdD8vXPyUS0Et/6JK\naM8+MqfZkjS55wVaxIIovj3874HoQiRD1sJscmcIqH5GArkXq+Q7yc5ZtFwv\nQtRByBG5iyDUKFGurbp7g64hhVppfCPcAY6Ywqx2+ISk7J+VCy8kSRpzufEx\nCi/EhAwnmtipyiloEQssisLhXK3el6qGQW+A88BSV8kUCCSvvupcfV9mfLAf\nijtdweCak+VsKMRQ9kAdiZM3Es/KGkdqGZLz5iMpk5GRWsizRIa14Pz+/Da3\n6MyS0oa8RZxg8OcqAzquO6kKQpwFgAKlUGSw+UwJQiQSRW8ALYthYgeEOTJT\nTFoIVNVGq0Djfrd2ALCMvp/RWvj/Kdq0wHwsvVlNXChAWzwzEux0Xjur9jJW\nrSfO\r\n=hafE\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/mergeConflictMain","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","browser":"./dist/browser/mergeConflictMain","engines":{"vscode":"^1.5.0"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","_hasShrinkwrap":false,"readmeFilename":"README.md","activationEvents":["*"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.3898e2ced3_1606265439549_0.5152658725927877","host":"s3://npm-registry-packages"}},"0.3.0-next.5f569de4cd":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.5f569de4cd","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.5f569de4cd","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"73fc522f6fa90d39130ddb4406426c92679ad877","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.5f569de4cd.tgz","fileCount":12,"integrity":"sha512-Guco3XcnEwVWT39ikrOTtGjm4mem9XE6tgc72u+b8EA/7hUlhuBhuTxXBA09Mm/T+QHSR0TOBP1dCmnY1S2WpA==","signatures":[{"sig":"MEUCIGS5Uvahk4BSrBYry58MfVGwNaCtN+wrmt1eOpvolBJiAiEA3qB+/G5MV924mwnptjLLmOHYwgzrFI+rF4USBiQEth8=","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":106246,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.13\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJfvvv5CRA9TVsSAnZWagAAsgAP/ieEUIhWHpAtgZw9cePB\nAU04gEQBmMAgnyUaC9N5+MzAMmjzMZ2P2rscEF8SMU3xhPkRdh26gmcA+VG3\nL6EEC4C72nkvJfKBBXhQPk1hCpeuvkKPGgaNTgylvkC2l7LHkpyB4OztQHvv\nZ5BrkCuzei0Jf0QxgyaVIOBLho203+3Psiw005FQ095paatlrM0B8S6RdsE2\nGpsbIQH03qkOsUeZGuOI57QrE/y0l1U2JzO0zQKDYs1yyUJohgdC52YkCKAa\n0PMpoAb6TmBQYubNzlaJZ8PJWHZlbKlaFu2v7UUapNpDcyXt+nUBtMt0hD2M\nU6JiCum+RuS3Xa11BjCPVrEZd7yjD/BIdgWxPG/krx/3yWbvQewKcBP3O9Oe\nbMMw2opMqtWY7ha7U29V1RHFCbR8Z1/3pl35zFjEJXtqsZwld4DIymtzSrTr\n5e3mpyn4nRgmiGdRAy/mIPYKZ4HsIvHyzfebcUdbDduS+0YT2gq5zT6rzfK1\ndv9WAD2pjDIx6Dy6Slz57SZj2kjrENDYQ8OATttOX9ILklVV9A/OVaqF071D\nnFYSqyqtarlR9AFcBKTtWIdm2A636/fTHn2R90kYabnw4rxp64aADMdoiRAW\n4pnGSgYwVRlYVZtHyDiPfLHVGPJnIf3Zy1SObX2IVUm5W0THWIKfLoYPlpYY\n7ynW\r\n=PgNy\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/mergeConflictMain","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","browser":"./dist/browser/mergeConflictMain","engines":{"vscode":"^1.5.0"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","_hasShrinkwrap":false,"readmeFilename":"README.md","activationEvents":["*"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.5f569de4cd_1606351865542_0.14551551066382107","host":"s3://npm-registry-packages"}},"0.3.0-next.1e77bd81d8":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.1e77bd81d8","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.1e77bd81d8","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"0acd1154fc9c094dcdc536ac194c233d67064c0a","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.1e77bd81d8.tgz","fileCount":12,"integrity":"sha512-BuOa7ThWDsJoYjKqv0QwmMqAMvVFExWeNkCP0mI50/rb+ncmrW/ywiabB4/NS9Xn141+GysnY4xjvpU0grbonA==","signatures":[{"sig":"MEUCIDADS9nOrvUCNKS/NF0Cv3NVTMOoCSApbHHBBRm63DW2AiEA7Wk1W1/InGfIOC29+t65aC5qYbSujlnnUEzZouVTV4s=","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":106246,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.13\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJfwE4ICRA9TVsSAnZWagAAXq8QAIMRSwk5o9RZDHMGdJeO\n7ILv6YKFo0jPTproBR4tIYsHRlvK6mQ5NHU1kHO6o0ILOByTJ8/RbkvBZDd6\n1QrfG16oCTUFN7pyeHZr7mA5s4NvnWP0ZIm4xQHhNYwh1cOiyRLob9t8Y45a\niuqCa1sN0V48zRpd8laHleirPgFEcPicg0apx4LpZu3yMdMZRYWB5iBjCb2I\nziebrJkW3xg7hTp7ZRObFSGpAHUeN3YLaMK2gMSZwuhdqquxZ9eerrH5+aeD\n+/qC19iPxM72LqicQ+9UDRSAyGmV5vgvjf4jD5PAJ3aSWuldkjDPjeJF76nK\nyPBupqbx7H0Ik4aeZP2dalqNvfIeNc4/tnLfXahDBVodZb/o7UPwBpI7nhkH\na7DzFXA5rQNCHgZYVpRrEMtvDzd+DjwmHYNyth4MsXqwWtzd8Cta98ja4ud0\n8jH+MpqQyLBKVZ1W41pdwrvgk4wQfx972xc0+peidfvbJpddDIvv628CfTwA\nMyfuie5vpb2Cq4rtOpEvrOeDXWUxK2N+2g6SGSOJif6y7d8bgbA2RSqEFK9M\nps76fbWmxM99D8b984qOIXHl6WAgpNPBK+nUZO1OsQ9MDPvCeaR3f589DXMy\nsQys0vKzTgYfVi77f9ILrNG/JEQRF+qyhMMjHxYiwxQoSJ2NMc7pXCuGGjcf\nTSMa\r\n=z3uR\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/mergeConflictMain","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","browser":"./dist/browser/mergeConflictMain","engines":{"vscode":"^1.5.0"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","_hasShrinkwrap":false,"readmeFilename":"README.md","activationEvents":["*"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.1e77bd81d8_1606438408354_0.14314513688137875","host":"s3://npm-registry-packages"}},"0.3.0-next.8ee75c19bb":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.8ee75c19bb","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.8ee75c19bb","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"e29bc17dec1e7dda928de79b3b083449de7c9898","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.8ee75c19bb.tgz","fileCount":12,"integrity":"sha512-Jay+ht62ZlxDo/1nAOnAUpeyLtxZojwJgmZMOFiqPyhN8D2oTj+34DdKcJ46BTokps0I0Xh4snqQps8QZl/HsQ==","signatures":[{"sig":"MEYCIQDm3NzyU5PxAkgKd9wu51xdONd7zxWlRlfmb8bZP/o9TAIhAPGiqrBRXHG77oISDDV9K0UkLL+KVBiMLtfIRbObivDx","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":106246,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.13\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJfwZ94CRA9TVsSAnZWagAAFtAP+gKGFckPR16RzVCpPCMd\neijLtuOSkovgdsrhAA0aDxuVxFT5KgP4jG04SQNKHob7Fs0ykqG8Jq3qFr8s\n6rpSAOH73T6zbNFQX92QTldYKu2V4PA9lfd4v2+LW6wNLAnfgj2R03LusBYw\nTgpk758xZ0bEnuo7JzCFlA7QAUd0TfX86lERulMHqeABO3cTX70Bfg3hh7f0\nZem4zm0QUdDa9I33A+TmVrIOrBTFgWMRj5pNPtKOhKNkoNUwRCAg4arhAxqL\nJJ9jB4xWSiconpQRrXASoYzvZfvsiTwK5PPKZAQF8Zc4uNRou1u2kSE4MX9X\nqjS028qOuNKYiYPWf1ORbQZwMFMIBIc566/ueh6qaivfStdBYUahCHdoygJG\na92C6B55Ce/AaiK4bycORbsJFHKKF2Gs1M5hBmdca9X94DduxGcC7fRh/wDq\nFpwiDAGmxKs35YkgabCeRovJU2gYMSSVnidRpgrFFhHKkzK2qtA5ODF+EcUx\nK1Qgokei/sxlBwhuFENs0wCvCaPyCLvF9t62vEgVAjuHuGnL/3JpIljWfC4V\nFud7aigpjVQxer9Clemz8uUquIIrfrlskAb4SGnkeYYWJLyrduwmtJIZmoUX\nfvv+ulU8iEw0pzwsdS4ZpKNzFy4884kdbYCwAcWhj8IbVSvvYiJOGH4iaM+0\n0jm3\r\n=7D/Z\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/mergeConflictMain","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","browser":"./dist/browser/mergeConflictMain","engines":{"vscode":"^1.5.0"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","_hasShrinkwrap":false,"readmeFilename":"README.md","activationEvents":["*"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.8ee75c19bb_1606524792336_0.02456071360789558","host":"s3://npm-registry-packages"}},"0.3.0-next.f47aae014c":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.f47aae014c","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.f47aae014c","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"f0155a9a70c80c915d9947f74a9be66991339bca","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.f47aae014c.tgz","fileCount":12,"integrity":"sha512-bOSOedeqFAcvmqkHuQAg1+FS2tc2lTyQyTxNwLj/P38/m6QJJpl+S+yxw3gksBubidW2zRGYnY5A7HTCse906Q==","signatures":[{"sig":"MEUCIQDNOrw3c6gwQxzyxqt/7JdGTzsvyq/03MVvcb8EWn1D5QIgTB0Zxj36jiV9chPksIMJ9Y3S7rpT53xz2fbN7um63Ew=","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":106246,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.13\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJfwvG5CRA9TVsSAnZWagAAX1UP/0GT2GDczUqjQBJU8eQw\nQ+xX1k6GHRpfmba7bPmwt8AhN49B6t2G6DUduc5KYMjzNvMieUmRnCHCbUqs\neCXBIFCYZahHSwGXIlD/pz6OJYcsZVIRsmhmwc4loBub/4/YT4xe3RWkHC52\nIXC5E3EdHURNmZFCOvHVbAQAxqZHK//VZS/knu9lnVDvESXGKdUL85jz+3LB\nZuau++KhwPKXwzS7ikD7+Hv+lgQ+jgxL8n630x3NtKzJTq5nhjI6pSWtJjO/\nQKk7IbkNcVxR8HixMBhGeztmJnebWtB3aF3xvuF5MuHAsajaXfBQVMJDSlgg\n+mmijzg1JEo6uVEojPSyJOofJ6ZiFC+peuQ96QHSSDUqfDO0Vffl+b0fyPkX\nS9jQm6L4JQJfGg9mJWZ6g+vUoP+ZvbItuzL3xl6EAyuSjswunB1DTBv9Oh1S\nH3ravJHDdcNwG2LrjVNqmZJQ2z5u6MU4nqO6/rqp57cRrtpXstXloIAvs4x4\nO9E2HYuLcLoHo6GiK/L2w9BDv5BLNlVCOHOjF21eXPIm1VxnK7DQSMYeTnxz\nH1mlXkx5hYlcjBFG7I+XXdO06H7nb440W1sLhhceF7enUgQhAprOtVofokb6\nc9JFO9sTB3T7Yenabe8efQAMw+p+nW9csa+WzQmeHQIFicNdukz5iyFGhOtu\nLJXl\r\n=QRDv\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/mergeConflictMain","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","browser":"./dist/browser/mergeConflictMain","engines":{"vscode":"^1.5.0"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","_hasShrinkwrap":false,"readmeFilename":"README.md","activationEvents":["*"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.f47aae014c_1606611384736_0.6439063609176567","host":"s3://npm-registry-packages"}},"0.3.0-next.9e5f14c1bc":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.9e5f14c1bc","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.9e5f14c1bc","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"add4be6289575cbdf1e3c78ef93c80ee85b6633f","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.9e5f14c1bc.tgz","fileCount":12,"integrity":"sha512-dJxvVmYD9kFBhem/owe50OawzQt1fCdxPhNbl9sSnGVxl2Xbq4MNqvCdlrX/vDrj28Gj2wnueTF4is18aIiYRQ==","signatures":[{"sig":"MEYCIQDKDlGj/NVgbQtef8IRaVoPF+7AGvZvQt/9EKErOEsB8wIhAMAbZ5t77PIVLHmloTXSGP6sDq8qrU3eSFYtFtAfpvpq","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":106246,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.13\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJfxZSnCRA9TVsSAnZWagAAB50P/jQgDGawU0GYEFKVyAhw\nyDESwpOLJG4jDnP9lGwUjipYL5VvWpMIYPbUqKAjDPEoEPYmXHxH62p5SwWk\nwsEF8QuazlEcg/y62QKvXeyP5qzmREJ4hSHEwHMeYPtriL5J/s/YkM9q5pXP\n1KqmcnykZhdnpFNns2Kagy2JYaoNRWzY/Jf8Ia8Mzs/cAHzHad7l0PSlQ2wZ\ndSP9PaFIaryprmH5lrqipkiyL1UfUkzrch6tEghX6Lr+jfx/9thLmq53fVVS\nhDPvKv9T3nioi0bNYrnjBrKogZpxodNfWxsbaz9PCBXMRq3/u8Vx4rEYMY8R\n0iQZHUCIN5Oqz0hN+7NmvLpUhpqgAbi/nXvX3cGDh/bIeOM0PI5Py0SHPPTt\nPlhsQFJizfm/q+Mo9rTGnj48rXyJb+uOASgpNgflgHPNRSoM53JE2l9LLkM3\nOOQBeY/axdQHVZjOsUbl0QvQex2qKji1cV7JNzoprKiSU4KBuJvrYYFqo1jp\n9obQZ5RqMYiPLhK+XECoLuQXH2LmhKX5iz3lNFMmYj02kYle5pgfRUXxRqQH\nur02clrjTkuPh0iUIMYX+UEMegilOes3UTwgqqF0yYHVLUyMU7n0GU2VyVOe\nHINRTeuotTChF0WBLpD+nZj0WmuVg94Atytw9HQRIzbYU5CocypwGfUisjg7\nmOz3\r\n=iInK\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/mergeConflictMain","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","browser":"./dist/browser/mergeConflictMain","engines":{"vscode":"^1.5.0"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","_hasShrinkwrap":false,"readmeFilename":"README.md","activationEvents":["*"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.9e5f14c1bc_1606784167030_0.059048077997898574","host":"s3://npm-registry-packages"}},"0.3.0-next.9dba02c075":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.9dba02c075","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.9dba02c075","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"c6dbf21996047abf4b11759010d1a34a27e87316","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.9dba02c075.tgz","fileCount":12,"integrity":"sha512-d86xbewXOt+h1CK8INj7Vd4kciFAMoNQ9TyFT6DgF2tDPDyA1TspoApl9GcKPbQeqPET1+hOquWry2M5f+GIaA==","signatures":[{"sig":"MEUCIHuYWduYNIN9gGznAI1JK6Ruc4YZQit1RHVz1/f6OnamAiEAy4VgJb2TkFGYhjSGqFeMfqZ0gb1JuKKNH9Jo923Vb6Q=","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":106246,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.13\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJfxuYYCRA9TVsSAnZWagAA9RwP/ja7MjkTLYx/h8bxmS8h\n2N6guNn8qoq7OnVhtfTojYW62k7VTlFs8NcPunns9rEjHIxAJLqkrInAfT1Y\nffszsNnbVN290Kw0yKwP/p5AisIoSCNk9PCTxruSLBlzYwVSeoYWfSyAdE/s\nh4T4INxqAXCFKnm/ao4kEKt5aXdhuy/WsZbAwXHOpNvsbAo8MxCHOiAXYIhx\ndBHRor5sWzZfyYlnXzaJLFvrw/vPuLViO61hHLg4HNcPqn8Eumeka+yqjYde\nZQQFMALST7N5ZZRqKk2zRh0JxiJpQQDOCRJCy028TNKhENyCrhMYflfvKjo3\ncZVxHrefo0EBGYEnBJX9rF4y+YogSN8rhlxXiSDThkbZ/pVKKBgbClCgkM78\nOp1VJvwBCVUGSxhP5Y9EVX3WgK6mY3qhF/RYO75GNuD4HGIUjahFxHdCf2e8\nSHtCyNrV5/Ng5nJvtl479Vsfd1X88/3RhCtX8Te4I37wCy9b1YtaeTm6mYPn\nyaJ08CaEDjotCTiGbqPE67+Karwdxf5YaecQ1ggqEJVYF//0r3lzw5dEWfpT\nPAV/CnXavYNxCSDENe7E2PqqbeAnho2NrcTdnkRgbORRfx2QTEGVrq4dwJOs\npAELam29jl92lGAGsxE+PZMgetuyJQkufn37QkVeiGafVDTgcqpLZqILeLWs\n4+c2\r\n=JRey\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/mergeConflictMain","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","browser":"./dist/browser/mergeConflictMain","engines":{"vscode":"^1.5.0"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","_hasShrinkwrap":false,"readmeFilename":"README.md","activationEvents":["*"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.9dba02c075_1606870552204_0.2137049590959048","host":"s3://npm-registry-packages"}},"0.3.0-next.253844006a":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.253844006a","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.253844006a","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"4dda6767dd95a9087f8e1f81184aac519fdec70b","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.253844006a.tgz","fileCount":12,"integrity":"sha512-gsLCa4e8zWi0orGthHkAvWYUXlwNG3fXwhF00QLHkAouI92S7mi0MYhU9HgVshoBZXceDwFxR+LewZQRgXKfxg==","signatures":[{"sig":"MEYCIQC/2CbWq1H/u7Fx33y6weFjB0OmMcvIY5VADlw9+ycb6wIhAL+kkvK78jgjcvtZ6jTwJotSkkVjaL3DoLvc7t+I/LJt","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":106246,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.13\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJfyDdoCRA9TVsSAnZWagAA3d0P/3FBoNHeijeok1XpZkGv\nZJrkJtFl3DNbxwAorUYuSKukHMbAcmreMnqqkM5192z06y3b164k+Q51sGyw\nb0MxFJZ6pZ7LepWAbS1ApgLvWYwyhHM7LFy4hrkv/O3Qq5pLcE4jJqbTlhbn\n4dAnm34gh7FgDVs8sVPs6ordsyLK2U+7xdyunBsD/cZysqbZ21HFab1Ferqm\nbZHr83BtMBdXwP+4iXDS7XECIWp2MnJzrRkpuJdDZYsOyOUjbgh0d65E8CJR\nFFCnjCoprk1kDJvu6gXrQhYGiWfPa6reB0rr6p03iOiQyFGuVbsdgpfMj3kr\ndCpbMRj91W5ILKrTlzHPaT+C8FDTqBfbusa6vXmevDW9erTgL3ob3ThVLINP\nLcoIf0Qs8WoFpiTaEn83v02UISqD3Xvyj8kHR9bWPEtoYVuBuPhIFtb/Nohq\nBH/bb86PvRt+KHUxhH4d6UiE+HvemzTdJpKpWwVRBSWE2LpnEefdJtyKae7w\nfQbhKHoPZzPNTLuQz0HlAhBuitdr4bYNND1M80RLdYSUqr0LKqlNZuKjuQdX\nUIU4qTpIaJr5QilbAcbqkfRU6U3mY03fezzyMVkZzq5+zuFGsJ7PHBIhlefD\nuzQT+F83bnWLAvPkj5nfOyHs2ynuy3faowv1lKXvXU20hf0VtC3O6NgZxyWk\n7c1o\r\n=IBSV\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/mergeConflictMain","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","browser":"./dist/browser/mergeConflictMain","engines":{"vscode":"^1.5.0"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","_hasShrinkwrap":false,"readmeFilename":"README.md","activationEvents":["*"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.253844006a_1606956903672_0.004495903508757726","host":"s3://npm-registry-packages"}},"0.3.0-next.ff824f2776":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.ff824f2776","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.ff824f2776","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"e7e25e66ccbee5bdf160ffefe4ca95f73fa167c3","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.ff824f2776.tgz","fileCount":12,"integrity":"sha512-2w6i1gBFo3s48wXx3ZBmuwG4vuMoVRas0PTL7AwWeTSKm8LWxkvRKFy5SB4/ZOqVrTT7OuRXwcQYKrpae9Q/4g==","signatures":[{"sig":"MEYCIQCVNRBgpTdyx71b1wNHh1KbxccCE4h3iAJtsslFC9vNqwIhAOzD5lHtEDpjXe0g6og74ZyTGX0O9+h0kZHCXV8GB6qr","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":106246,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.13\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJfyYkCCRA9TVsSAnZWagAAsY8P/jmmLPginHEOhWPGuHiu\ngZu5etGyDR20Q5NfsbRy9pStbNIKur2DbSvadUJWDLygMd4MMzL8iIhmaQHq\nX1v73hQGtAYQxoxUMBmPUEh3xCWo3DTyyjjRR0sEF/l1FtrImMdKo6mRxqyH\nieX22gfdVJwdrysMFJIau6WpXCVD9h5IICPDhaMtWUxXJ8D4zumBLrlFMmC/\nGPFniVeJIG6rqwhMHPiw/6qql9V9y4xvqASHGPPxyRaklh8OddgTWAqIYo2N\n4jc0C9LLGvB9PRUdETfEKyxFQ5jDyMPN/OTVb0mJ/GXTTYL3ggtHskxD7EsO\nVYAVZ7atIv8CHsH1IUCFlLvkJdM6vdbZ4XBZLX0WN56Fiu/3EePUA8P20sqR\nppMrWiK3YfD7uYBILQdXPIV1goqEtVn7r9k3SY/JUQYCN7LwXvfLRR7SR2U8\n6R8UzrTE7bltdd/HZnV7J0xX0ObO4SBcEgopl9XkMO5CfxijB3ZEFU3fjV5b\nvRBcIrNQraDOcrTazIZmhLnISRNkdK0O1OQcPZrA+PtpSraDb44JEGeFL3If\nOccX495Ut+rnk6UH3QOocyl5v7tsODjxAfWRdGpApHvTVgiZiod35BODbZ+c\nt2uRcNhPZJ4tBmyqfFCR9tS/ouI1uoC7Mcl9RIgcj1XzOI/GfQBORd0IuJXt\nKIDo\r\n=wYlk\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/mergeConflictMain","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","browser":"./dist/browser/mergeConflictMain","engines":{"vscode":"^1.5.0"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","_hasShrinkwrap":false,"readmeFilename":"README.md","activationEvents":["*"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.ff824f2776_1607043330154_0.5342062413304136","host":"s3://npm-registry-packages"}},"0.3.0-next.532ba43c78":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.532ba43c78","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.532ba43c78","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"916cbf42c59073c437cf4a791844c504373fbaac","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.532ba43c78.tgz","fileCount":12,"integrity":"sha512-wVu25k7tR7FwaZG4cwMiV6l3s5pXaQOCyfn9sxp2riUFzm3vmeKwV4BdOCESBId3xueXITmqJdOlf5hRieA1ag==","signatures":[{"sig":"MEQCIBxbDE+hycvoOraIF84b6QWRGn/YOENqo9pri39KhhIhAiAnNOJuQIcRNZKltsk2bAaEJjuFIgVRGgMKatHVrbOPMg==","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":106246,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.13\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJfytohCRA9TVsSAnZWagAAYbYP/04VvbHBNqNU/4c99Olq\nFt2wVci6SPASB/PuCcj5RL6ukE7lNF+yzTRauC7Gzrihqh/hRt2ew+3KYPBW\nrZD2GVrd6SjRKJzpRTqJPUgd5Xdx8HX/04L6beIEPrPJniHDwp2Kwq7Udymi\nBuBRE+PZO7whvJ6mJQB+9kpH/HVv8PIqG+7kmSS3pAWZqGMTo529U+nqVrTK\nNnurJXZsYR50v61fGrPshaicSp+RxY8C7Wldo+Zmwbuv0gxin2aHW6iw4I1G\ndsL1mBRZJ+Sx9yOBeAdn0v8hbfUMJ1WUp16DWVG7hU67zQ2WPkVD68qc6oab\nwup1wFXKr7nvD+bsFNBC3UN5yVrMESiwdCrQZ6WCmTSjUdn31kCP36gYERY6\n+Ho4LbeuyrxUq5ZSfUed8gYJ20U84QIEQHeRP+FUaPwndmeknAJwKDN3ROa/\nUuf4bOevXgq+49fr3ogKofoNPie/IEfmH84BdvfdAQqg+Ozld59tXZWFoPmO\nj3P6avN/5vkmrHwDxBgkUIPBnJdL/J/y/Ntla+36LiekXE3DYFmC3Kzu5Lf3\nN9IdRRCeOHDkxVZGqssjPrWHaCsyCri1lA6ieh8wB89fI2zKOOFisoTK+pCd\nHPHJZ/KYbqeLSC1el/yGQ88vTpOffEs9/DgnPREoiLxoYUmIu1gif/LiqHCR\n12+w\r\n=GtJA\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/mergeConflictMain","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","browser":"./dist/browser/mergeConflictMain","engines":{"vscode":"^1.5.0"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","_hasShrinkwrap":false,"readmeFilename":"README.md","activationEvents":["*"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.532ba43c78_1607129632587_0.6429759668637045","host":"s3://npm-registry-packages"}},"0.3.0-next.86d779284b":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.86d779284b","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.86d779284b","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"72ee54023be892f5f891edf69daf6209a0c5d294","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.86d779284b.tgz","fileCount":12,"integrity":"sha512-JpIEaXc2zJeoEo/kJr6qMSegPfI+u6dMeMbTN8lBxrSlYr2xBLBujLdCb2s+vGM0WGQ/LSiPMcXCA82aCraoEw==","signatures":[{"sig":"MEYCIQC1ctr/FcST9c8LCbgFVaJGAin0/6uaaUhmRm6jngp1JAIhAKrMBOniH8dF59uKtlIjzAtu2eu11jSlfTRf65A1wIGK","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":106246,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.13\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJfzCyKCRA9TVsSAnZWagAAp2UP/0a51QQVMde+4KdjhhUp\nQapbVc9thnyW9VCgJoO/HzMadThIkPdsYtmBIxDdGoAZegPIOLHmymZrLV1Y\n47h29qysQIbiK4zUn8e0oK26HK94lZwPTtYt75f3lHofFjruy9DmLeHimdu5\nQpKEBLOinT5+Lci3OOZWVtDHlVswqzmVL6zZVwx3/7m9KfLFGWy+J5VYP+Uv\ni/IQ2qT3pgNoKpRwVCHWduir7YgRc8hfHTg3SQUT3Z6t9CXSG5Oy3fguwd3M\nuKvH7b2Wd+5CwUesa+w7IOLHht2IDuE6O+mDxc8xy3acfO/Gm/CoXHkvCWht\nQfhvA8oFAzjy1fbidrvD8wmlSN3DYBIwsoKPS/T92kFpNzNffc0epxkCxlmd\n4ULmHjAjNGQiEe8G3YEFXJXBrovJaQyJFEL0VNOPPbBdlzncfgTe600w4sUo\n0sdHpYsMtjwdLUK644pkv1XP2XPWqifRCfoQXWqk8lYiXiDvTB9/xfL+A6A8\nFmUoBL1GoQU1gzV9pdQ6XFEwnzkgUp78hzM9gjTh9kzt/nO6VZkK+S8JnTpo\nMyXxZ86CYv9bJmlUV12us2J/Mu1lHMRBF2PB1ElmhE3q9qohGtYMKH+NfBx/\nAPjS2aFCUyGR1n9LnVr84VKYL6ugj/Hy//g/69ZwOMOSZ8zXCIYEhUOMnj1h\nostb\r\n=1PNJ\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/mergeConflictMain","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","browser":"./dist/browser/mergeConflictMain","engines":{"vscode":"^1.5.0"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","_hasShrinkwrap":false,"readmeFilename":"README.md","activationEvents":["*"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.86d779284b_1607216265967_0.929718657342459","host":"s3://npm-registry-packages"}},"0.3.0-next.fc9ff5d569":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.fc9ff5d569","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.fc9ff5d569","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"9e8e2284c9f3aa76b69f4ff08ef6ae2df3948abf","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.fc9ff5d569.tgz","fileCount":12,"integrity":"sha512-XxvaR7USqro4SY+O8JTVi3GmP4blufi3gE7o/ITFWN6lH63SCHU6bzZfCzd45N2rn/F/AzHtTYTDIyxWMvKWxw==","signatures":[{"sig":"MEYCIQDSMjgwofaPVcHKu3jU17Z5ED3yUzlAsFCf3FZABCQxTQIhALJNeVCh3mMB3XJWRPHOH9zvdhCel41kiRJnzv6Gr+Ee","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":106246,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.13\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJfzX57CRA9TVsSAnZWagAAz3EQAJS+At/+gSxI6T6WAXoi\nNjBx7scE8JyxnbDYm7NzLD5zUEEzZkHJjH5bluF4ajZFjhDn0bJiL1f6pQQv\nL7WfxlMvFOvkse10u8NhqXEVhfcbM958JHX75Djoo9Bh55a4EWtGcpbWhUpZ\nPvUtZtKn+xhlnNMM1pTSilkQJY/wkODGoiNnobeR3mByKbSCADz+FqvxzG4A\nsLbr1sufRMdol6Ms/40ahxTs1mUdyEsXmHPeSQ+G1+X0piETW/Cn8krX5Gy6\nOCEb/W9W8wc6j52/tM3w7BDXYLbXeeZ2sJwxlOvd1WHh+VfyRTI40yMMOQZh\n6dJmzfAz89/NGREu6/mgan6nwEkcXQAqWF8uu3v1mcsEn1ic4FqhGtIv5FCI\n9FgGscTN7Guat9TePpkKRqASbQI4eW8k+ZLAzQkS1UcCi0uVtM0MMeRO41a5\nJ3sB6/QATMXWPC1gpuQ22o11jJ14A+GtuWuAiheHi0DtzpXHAu+brxjhqmEF\n9+Q3xaBcuv2E5JXRfk8qrpeS0nDUen0i1aKf4GKIydL/tlbNSEzhYic+0WFj\n3IzgadY0YVeamz8u/+L5CvqUtpzvUWyGzaE2AcbsYs69YRG+/rBpjdSWlqez\nb7MnhCnHgS4EreFqoNwho8nyk5Vd9ORwmn8WlduUij8GKItFE277EABsvObK\nrWaR\r\n=gZnW\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/mergeConflictMain","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","browser":"./dist/browser/mergeConflictMain","engines":{"vscode":"^1.5.0"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","_hasShrinkwrap":false,"readmeFilename":"README.md","activationEvents":["*"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.fc9ff5d569_1607302778773_0.5236952807945061","host":"s3://npm-registry-packages"}},"0.3.0-next.91c7834e92":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.91c7834e92","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.91c7834e92","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"211920576c862a198005c5e2135c1d959312d04d","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.91c7834e92.tgz","fileCount":12,"integrity":"sha512-ay+de+bwY8MiZUWj5906VQyjN7LCXnFoAAyinwFupgfiLOOlzWzN64qtIQ8fy79+Mj4yAsCzOyv7ZdI3eNPzCg==","signatures":[{"sig":"MEQCIGbmSKmPQJutwrqPjKpE4mQdy9py6kphZHYDtXM0NR34AiAMctR2uWZNw8mBX2xlcj4Me6sUI6GSDjvhSZ0NIUkAAw==","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":106246,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.13\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJfzs+WCRA9TVsSAnZWagAAaZUP/0zdpon9WjwnOjh4u0E4\nJ7qHU1dmnIgO/DThZ0J2FxiaSShVNLEAVdF4OsUnn0o4XU1eyANLkB7GKHFu\nL9+fAfPaPCw5Grm3tbTUljr5dg2sLnKw/gmWGtqtdxUo3Ej0NKB8f4OXB86I\nh+j9qeZsRkrZ1y2PaOaaNdWzSUCcg1B4I7aMhVxgevZvuH/hi+AirLpig72J\nrqtGudKh6Mj4auJeDWCaoGBSztFVOMPX6017TvJl6nrpXvRi64BtGeR6fulO\ndxGMPSJYxfR/IhgclvNQOFlqCg+o7bczickIJvAcTIhmeMQMStUGAJhpYxzk\nFgsgHhjX30yIcfROR5WFZvL8T178Kr3YTa/uVpbxapavZvHuh2+ifybwQYvx\nSfP97ukOxk2mXEtPIdxnbZfMHcq+1CqFsgXJQuIZxYzgdCvigc4oKRNQgV4E\nUsrh4lsJHcv8SpXB+hkheoBkh4hzGFXregvaZT4VjOjt8QCQhTMjuEtwHQKK\nS+I/Q5ymZ0gHhpUo7K7CcWv9QXLI4yAAu874l29+vT2rMdtIckeu/WmNySJ7\nGCcIY3cGkQX4TlcyDLgZpNDzTamnwshEKIcE1+whESoTz7eXW1gjBoPRCevy\nm1+Vhr8yTx2WemP9xrj72nzPu3re2FPLQYEYBS9Ad0F8bVd5xmgSdeJ4B9ze\nzFNU\r\n=Wzny\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/mergeConflictMain","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","browser":"./dist/browser/mergeConflictMain","engines":{"vscode":"^1.5.0"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","_hasShrinkwrap":false,"readmeFilename":"README.md","activationEvents":["*"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.91c7834e92_1607389077722_0.2533553674016027","host":"s3://npm-registry-packages"}},"0.3.0-next.82974e8cda":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.82974e8cda","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.82974e8cda","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"75631144ff5b5ab79ee0a1c93e5b19acfbe75281","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.82974e8cda.tgz","fileCount":12,"integrity":"sha512-dkKUoJPs2gFEwBX12GvQL/7U6C4NbJ0hA81QT+BwDIddpp1jXYJZpCuJ48VQ+rx6FfnTPPH7dyL+uQ3Av+tzpg==","signatures":[{"sig":"MEYCIQDO65pCoTETt5riowH9eTpR+bucexuhJfwU30AlxPLG1gIhAIFC2gq9E1haJhp0gfj8eV5FjnMOQV/eCv7mw2oYWm2U","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":106246,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.13\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJf0CDiCRA9TVsSAnZWagAAygkP/0qlzFxuLTgl9FdqhqDq\nqG5CXxhSn2QB8vETZWTWaZs5ut7S6deeO167UqOoS49LtMIlrXdEnohfM4y/\naL9XiKdwAGDuj+b01lUS3UNIzpLmBYgRlOiJxPatIoP5Rdpj0xn0AwjufTei\nXWaM/PAnFzlgeqRqUrhIhNcE9T3F/HmO/Yj8/Bk+ewOAFdfpwI4DM/wsa7m3\n/0WgGA31h9qmjtSVMXezNE5++bZ5d61qcATAIZ9HGn7DQ9QQdH1fTSTTl44n\nkzEOcqBjJQtap/yPNpEuiI59K/vviM8e79jCjkq7LBq/VR0/FxYsg8kVgf/q\nA27zD8RH15zvLLyBHhpLIVQuELmZojxJixyYHFWBZlIW1cgqrQv891Pc0l4f\n3Mf7eSa+DBWKhMgib7+Lc52MUCjlW3/0r9YTPhmQo96r+VOhtm7H6IRL4cMo\nPqy/oVGVYwWZHiKrLoBucSLyh4+nEhWj+75lbJEK+4FP/i+14y/dKEk1IXcX\nVQJIgGULo+rnyARDQq+ZE20JeWvF4cGIME8dNLZDzCRPIjb5qqm671B7EBl2\n1fM/T93B9ptNubfXoakNfuVPbx2MkBsEZPSxJaGchoYcsW3YhwozgTyNNwdb\n3fO3gZqcDFzb2ct3Iw3fLga37gsSDJIc9bXrhvQjw6ZcW9xHNumfoopYWuzb\nPEWl\r\n=R77G\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/mergeConflictMain","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","browser":"./dist/browser/mergeConflictMain","engines":{"vscode":"^1.5.0"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","_hasShrinkwrap":false,"readmeFilename":"README.md","activationEvents":["*"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.82974e8cda_1607475425973_0.3126260958448097","host":"s3://npm-registry-packages"}},"0.3.0-next.79557ebbd2":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.79557ebbd2","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.79557ebbd2","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"7c631b1a4b6d724e4ce924a259091d3d3aa62f28","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.79557ebbd2.tgz","fileCount":12,"integrity":"sha512-Zhz+LGT0GcYPksUEjD2iCcyomN4MKZK7Cff7CW4ka5eZ9P3/OEbBazXjM0HL3HDDaasaB8jV1mjxU7AA3IMeOA==","signatures":[{"sig":"MEYCIQCMlmYlQipwU5Rd5JuP9KZfs36IrXTK/r0TttgON5z1BgIhAOeQwwgvlW2BpIZ6KczmbVF3QSawQlAdAOuRjQe6B0Pc","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":106246,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.13\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJf0XLFCRA9TVsSAnZWagAAuG0P/jP2RNl7j5kwrY6ZWUTJ\nts52iH49y5YHj63vuydm2vkSz1cSLCrOS81E7OfZcOkWuuS1PBDuzoiyua0m\n6I/3Nk+jralgeHvvs3QAgr3otFgyXNRg8c4Egt2tApAo3oERf1sLPha5uCoB\n4xZcredVRI6mH51FxnAywRMf6nVA+QptuLP0LGaJm4TxrrTGTNI7XGMPQrFL\n6bfXmbDRPxwimjRrQqz2D29d9qLZcYsYGKuFo9wTNRwTvQZ1BHHftvuxgUaV\nDmfrCFVk04DB+EOKrqenvOfeN2SyUYfntEQZn6/vsweI3sI/7sUHiJEVChrw\noEYLm39DyBo/1kyL5a1jOeKoRMkKZaVThmna/dYCw0wHtMPmvRPjXMgaxvGW\nvnUlhSPWzgLtQRHoKjPY8b8euQ+IdDQTjaS3fjVSUAU2yjxHH/sYyMDV9PDe\nGQTAjhTDnqDuGckxxXegCU83QVukRollLCr1LR8tI3hcmI3/y6GUhd6lMgiu\nIzwTcsUGjap32obGZa+OuuROKgIRRUuRORl9NgIX75wRsXc5qqpfNr3Pdfoj\nqAs59llIjblLLuZ2/MfjccBOmVCCapbECEY91xdpm7qijormsqrtq7319PQ7\nVUiKmdyN2loAFdK0g13gT4d1Kvmamb9OdmARMymdgJeecnNLFqfu/HOoxyjb\ntwx3\r\n=EUy7\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/mergeConflictMain","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","browser":"./dist/browser/mergeConflictMain","engines":{"vscode":"^1.5.0"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","_hasShrinkwrap":false,"readmeFilename":"README.md","activationEvents":["*"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.79557ebbd2_1607561925273_0.0651923206124343","host":"s3://npm-registry-packages"}},"0.3.0-next.29bc5baadc":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.29bc5baadc","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.29bc5baadc","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"f71945cdc1069d8f42cbee10cb1453b4715b609f","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.29bc5baadc.tgz","fileCount":12,"integrity":"sha512-Fey7HXXycAQeC/UQwQJNASHYup759B8yGsJuO+xz19ABNJB9MPZXxa7iIFaG0rMl7KWIh3lrh5KVX+huq7u9Tg==","signatures":[{"sig":"MEUCIAuH3+Cg0SHrqN8uQKibGgUoC22x4n/lA0hlKHXzUYslAiEAjfJXtBotr5mwkYwlmUdCldrDurFmNKzspNHxu5dz2MM=","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":106246,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.13\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJf0sPuCRA9TVsSAnZWagAA4JsQAIRPo+X96OmrvT+CVY67\npkvIoAeRsTQXlBPR80SWKY72i8MDMovSkldVQkfq83YmWvaX50SIoU3rnVgQ\nEwEUMSMSCHWl7zFxlEGYK88r/lhQU6wtgAV23ukOVXbp8vhXxhz/V8dLovx+\njuN7PhZT3yC/4qczYXExGQPyu3WeismtRTQ8T9f7zs9495vkgOGYi7w5OcSY\nRoEx5dGip/0Cn8R0M7KWx9QWu/EK0lm7bm6cXvfPY6Er5jBaUmoei9KO3EOs\nTlh0GRoMtwMYobgyyA13iNIKvRTdUisBexyXoD5WTaULbh70uv2rPYpGOVw/\n4mhO+d7PW/6zjEY/8jb+JopW6yib+uKhCScwBetvcCK3ipASQPSw4FF6SgSP\n73HwgDGOsjgMgQY2qID9EDAA8hFFz+MTQ/0/RwV+n1oi7riO6NkweyfJNcFT\nVFhq3L+ufnzez69+3DZzLcPYtJ+CbctoGBt78Nxbj4dB5mEJEUZIKxyimCos\nGlV5xdCWlxOHikGxNl3zmDQUwkiakvobj0Fz3cLo7qKMksnKDZbYtM/aUo1A\ni+9SQVR7J0sJV1z7jL0JVq5wGjaCYU5d5+ZQHUkWopd6KyAuUZvlUByjAON6\n5/NAG5XsqNQpN5OUdXAk3VyQcsICRdvRQ0UwZbp9WL5+uPQIxDRsRPTITxeo\nqmQB\r\n=hx0q\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/mergeConflictMain","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","browser":"./dist/browser/mergeConflictMain","engines":{"vscode":"^1.5.0"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","_hasShrinkwrap":false,"readmeFilename":"README.md","activationEvents":["*"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.29bc5baadc_1607648237787_0.3631347031448211","host":"s3://npm-registry-packages"}},"0.3.0-next.5954c8366d":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.5954c8366d","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.5954c8366d","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"142b13266bf40bdc1e3b5da5d887dd188dc43c9b","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.5954c8366d.tgz","fileCount":12,"integrity":"sha512-VUKFbowAwOv7MxKYHwQDNQJ88WhLm3ZXMs9Kjq5MlbJqPjGi2jpn/ay/M9wTKT5cmHWPTb+YOTBHg++oMVL2xA==","signatures":[{"sig":"MEYCIQDtoqHwu+/1JkngZyZjkwP68Kkg8ZK6Yr3a2FboxUwcogIhAPERRH6rFc1SRFSMDAsYN+6iCKhTSxYQmym1Sdt8cvW/","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":106246,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.13\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJf1BYSCRA9TVsSAnZWagAAEtwP/3iXRnMFbMXgXpGFt0vp\nO5006mbUjPxYgJp5SdMsJ/AgXN6d/IcOS2E0TEFu6kcdlDZb5INUhvcjEKOq\nPYyV+gx4LbqCGeuKAj+qZAmXO5ruWtZ4ll+HvGvj3RSFcB5PD8wGahks//UZ\nBZCaKluOPiOYcRnXDl0gJFYvDq2lEz4z2rLKcXlOvPiG2rTVzZQGtkbWfqwo\ntUnkFC95fLhYEis3EhbAhaNhCIUsHHQO1LYp8NU3FhlbmBocGyVi/r0hZHNu\nCLkA+SoBMDjE6lCUNEQs4qbR2LaG5uUuTFxZssvTg182pU0tpopSce5kJ2Lh\nmmQdxDmziQZnKDMWRR56J5CFr8ktXfAMmjodShBpcveL1cJWKAvp6dvm4cZl\nE+hKKQyHU5CjUW7Nst3jjJERByn58adpRXCkwpLR6R7shDBHfyCANEV6lr2c\nxJymkaue6cVy9cw4+uPziv8eXvlzGUPi5XJYft7oD7t/2Sw3PS4H7wym9/Mu\nFPBU0GMp2j668VkIWdY4sDbDy5NvvgCqHlycryECAQS6Zsn/v8m80sFq+HZl\nSa89SlkKt1ghscV1P7/RxvQXyJ9u602Aw7pWKjWHTLUbOjGko3zinHPFmFIF\nJ4TosOhYVP+Q0uNh0KAKrA7FAnQiOVqFHWWLTnEfCLfePvakJj8fRENZaXmZ\n5Yim\r\n=ENKP\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/mergeConflictMain","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","browser":"./dist/browser/mergeConflictMain","engines":{"vscode":"^1.5.0"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","_hasShrinkwrap":false,"readmeFilename":"README.md","activationEvents":["*"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.5954c8366d_1607734801400_0.3403005642995318","host":"s3://npm-registry-packages"}},"0.3.0-next.96b426ef1d":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.96b426ef1d","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.96b426ef1d","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"da8a5d2e8df6fed58203270d626ee45266a51eab","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.96b426ef1d.tgz","fileCount":12,"integrity":"sha512-aX2dAqvP2H21IA5C726yI9F4TUQYdQEHrARYaT2oMJmx2SDrOKF7PiJ0nrrw0ZoNNL7/GLBZPkaKPCK6/4MH6A==","signatures":[{"sig":"MEUCIEqQJ0o7c41xcbF/C/Ltb2dJmhNtKQ5YCPfpyghin30BAiEAwdwVkyasKcQ7xc7kFBFIjgFQNR6c3OwINpEjAG1Vzls=","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":106246,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.13\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJf1rkMCRA9TVsSAnZWagAA+mQP/1GChXrs3wMgZdWX3HLo\nt0KwGaDUNEKnYp+n0zHikQTGKeRcShtUSZR7hGmr93MmrbmN5igcjryXOjFi\neg7xLKL6jY2Hp7VzebZGIwvHmCd+rF5DD3/B97dTUlbOAxgBoFzc6O6vrUA1\nvTGANPXYL0eanA7nGa7FYYkWuxLJgJFS+AtMmKYN8HWeKnZkqsbJoUZWqL5w\nJz5pUE5Ugl2NlQFvs5v0AW6AwSRmmEUtvZ4BZummeHCPwQSuRjqLuz0yHSid\nXGvgxbz1G7reR71bp+GEbUWGv4+coM5JwoWBW8sC73VmpmC4GIOrQC5KDkLn\ne43j2TVptTzAxoFtE6EuGyPSS0Guk5W2cCiTByTkMJjvrGd7K1ro1bXDgVmJ\nqxEx6iB21OovUwUmwr1o/YVrdC9y7mDaB46zrO34uTM1XCQc6bzBy9AK8NJI\nDm5z6ABP/SpxwNcco+PQbNULZIzsX8O20bms0ZCwfmnwp4R9lpJTtJ4bDGX8\nUb3oIdgzlDs2TXTn1TAPdm8g8BK928b+djEX21sOoZJOcEh7aKzwcgu/IGvW\nBkZ86JfXhH61hB/mBBotHHK3W4AJWkCQfEoCm5e6pcd2MMbRk+wDRujslxEH\nJckLXM4nm0+BL0rirNb8kOgDY2ePGXjc+R4R773lL8wBKfNRlXMj/mNQv8Dn\n2Kfv\r\n=6dLE\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/mergeConflictMain","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","browser":"./dist/browser/mergeConflictMain","engines":{"vscode":"^1.5.0"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","_hasShrinkwrap":false,"readmeFilename":"README.md","activationEvents":["*"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.96b426ef1d_1607907595587_0.9295317196348121","host":"s3://npm-registry-packages"}},"0.3.0-next.14b7df48c3":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.14b7df48c3","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.14b7df48c3","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"253afec7516034e9cc247eb8a3aae9a3ace1de90","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.14b7df48c3.tgz","fileCount":12,"integrity":"sha512-+isnF6yHbSibw6ivt9xW4NZBQtN5RJmlJ0UrwSMqtU57NXlzmRyd1qCoQGpDdSVsfnJrypvktZd9e4zkB1f3yQ==","signatures":[{"sig":"MEQCIChFR0akVZi/HA/Vs4QKKO6XmeVgKFpruJylIIIrWMMBAiAQnfVtPZgnX1aIzkDFwN5YtiK1AxPkeLa5P/6RYVSQRg==","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":106246,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.13\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJf2AqgCRA9TVsSAnZWagAAA2sP/iL9geL6aQXFubGOo/qR\nb4BMeGcLUFweU02ykb7jlXQ4SpHqX0C5R0EuMZaCU7lBV3JjFTzC8mPZx4Yp\nl+Je9byxZXcYLh4B+oL3VkPq/1y3PwkfZ+/ATB0g8pfzquiRPvDrmDSG03cf\n3ZZpQ7hcyA9F5/wEYsY3zGBvCTM8dM6Qt+0r5k7oshnAjwUVC60ZDuKi47NT\nHsPMRHS7xaagpMGZnKBpqGQMmmcI3bSVyQCh6Ac2AHQA9sFB5qzqPUY2OKFX\nZZqiSqBNxs05yqSnxe1+4GfBIrK9VZHsE4eUq6ypxT1z9j6Dexd66OEQp20n\nRqY6lVaHivGh4J7LueqZVH8GAweFnkrcxBToCBFwx/9fodUNU46FemIZ6Q7M\nOJFrHSVmTm17kpMSix0aO7O+cfjnO9RBzAUi4LRRWnKH2ZU+LwPu+QVp3KFd\n/pLOFW4V7hZwENZJmF6597Y/DPwAluGyA9CQSTBg+7zOOWeCfgBVBoPL6H6e\nzLq9Mn+OTAoRt/AUmYiFjPaTx/x3ENS+QWU4TEeSYhZ9E6UAznW0A8NJg5nE\neJNNhWSRZa3ty9sIBrgCcYkFEdvT8nJSpcx4FNDd8nODM3Ls0JoLxiZAhtjJ\nHgh9qyrK0rRFhxSHW1jD8qC/fGtvThZpxMC6GjvYwhImmhMK2e9pMkku8n8G\nfRU4\r\n=46RK\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/mergeConflictMain","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","browser":"./dist/browser/mergeConflictMain","engines":{"vscode":"^1.5.0"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","_hasShrinkwrap":false,"readmeFilename":"README.md","activationEvents":["*"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.14b7df48c3_1607994016419_0.1221522892215825","host":"s3://npm-registry-packages"}},"0.3.0-next.6d3c2e6835":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.6d3c2e6835","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.6d3c2e6835","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"44f730978e692797f94dd87c41bb06404ee25736","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.6d3c2e6835.tgz","fileCount":12,"integrity":"sha512-qTQ4FXNqF/3z9HMPOJm4DWBB6FSvdKnjsq61gSLYF1cc33O1F+QiNKPDmGNVflzX70j1US4B2POibqcqN4A/xw==","signatures":[{"sig":"MEUCIE4xbz1ue+nejKnrllPrIJaPhc1qR8XNc+D2cEf12LVnAiEAyYmbceUcX051wwIoYTvYiuC7G/jY/yMbbj5HtKCQTyE=","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":106246,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.13\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJf2VvSCRA9TVsSAnZWagAABgYP/Rl0E4BWSWNVQ+H+2A0z\nmbWFFtBt0AFkiT+CNN7+c21CjKtRYbp3sQvz9zcy3bPF8uJiqfIJopu4kQAk\nWBVRmG/jWP5bDOLXkr7vJ8x9QY/Z6JB/V3GUfrnajRJLEu1ULkTHJDIHuFDC\nUUgtfIxUQ0F5SUd+OqCynQs8val1PF04CwjZ7dvPel6PAdFwsBkOVr3tjp6L\nRRtDFnp1BSwRimB1/jdbLSpQixOpYusqUlG95+HVtUgVif8IIEWucjJ09kwW\nUp2dbMi9SqMfAd4a4pG9b1hdqRLIeJZ7ttv+2QsMLXrG2GBmFggcBwzULs7x\nqijQMr6GPdfY2HglvOujvwj/PUIb1eKWIJByjifEL/t0MnMAnHdmej9SJI0w\nr/23NC7GhPGpuwI2OR01s/OUAKUOIGAKsgfXS1gDiFk5QZ2fhh0v1kvI6ZLt\n4HYv2PY1yjeXLDUVWjS9bTAAB2IGbCEoRV7MFyyiXfs9b0dUe7X05G2vz9Ys\nrCEyvk6NUmxBu8ixTDkZbgp83KqNf/M0loGYCi+PsI9rmY8u6sDg2x+K613I\nDkWIDge6eZulULy8P7Gj7V6VDpa/h6t9qqLWGIQyL5PgdqSLlob63U6eDrm7\nkMU7LSdXRIusFliyuAkQon7EJcHBjDlRU85rZto6DcaCUTDn+/CU5nG5E5Mq\nApkT\r\n=rpZU\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/mergeConflictMain","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","browser":"./dist/browser/mergeConflictMain","engines":{"vscode":"^1.5.0"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","_hasShrinkwrap":false,"readmeFilename":"README.md","activationEvents":["*"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.6d3c2e6835_1608080338327_0.6723047591368216","host":"s3://npm-registry-packages"}},"0.3.0-next.d6e8feb774":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.d6e8feb774","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.d6e8feb774","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"90285124bcd400f187865b8e4060100441afae9a","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.d6e8feb774.tgz","fileCount":12,"integrity":"sha512-Mb46owiZJJUMVv/ecbGK1NA1Lh9wvDZd6YgZMhdVmNW6Ns2wmzPRsaoBu1TH3yPzOpP8LMid8a4MgIXlW/hXXw==","signatures":[{"sig":"MEUCIFC4s8WPnAwEGkIphSxboX88UZRHHT2O2hhHIBCx49tRAiEA7yLEqNbyR8imHuyu/8npdZAb2nN12WGfHhvlLEfUWRE=","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":106246,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.13\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJf2q16CRA9TVsSAnZWagAAR/IP/3nnMRBHm7cdeHzN23pA\nbgnwjw7Jo7A1QBi9AUtt9BxKXJ5uYzRLt07WgD2R2xQolZtBDJ5zxZpOWS4C\nt+wfvXqyPBCM9MJ+IuqOFNxJVMIJkaWDa1Q/wMbTIp4h1XnJRnfRjMDJuQ3x\nkIlg0GpLdMJitvcK8mnJuJ7Sk20ikThaHq37Z4Cb+w+S7VqtVcwmnH7sXPUL\nZZpPH6bRUjZTJ5kSTAp0XcezKyMke/Gg5mWAay/8jtnTuANbQhOVsEz5Ui8y\noTo+QsO1jlT5oUGWLDfR0GLquMYXAQahBecUhqnulD93K0dQdcLcMLE/ynzT\nE1n4VEcSbhUW8/B3wWKlBesQ8pHe4DjoucrpCEFhffg/jBOe8xuNzF11qMP1\nlRL5Gk1IYgm42VNkEIQFfT3WSey5pG0/21zOCdG1hHe1LjXw5irdFc+N4iKY\nC7801ImlKBJnBezMfpwvdVLqxEE1+uACLiCD6b4WrR5BP8Z6Y0SRyOw7jChC\nFJd3YmUT18eIA0mNWQX8fCE/tRn3njRv4hDM+5h0Qodmn4O9VNH0GLkNsaKm\nWbQ2we1+RjKFdHDsowClu7yRLuw3A6GQZ9gMoSUZ0uMMr+i1spEEOm5hY/Vz\ndBDiIwAAZgmgS1lgSJd1LrpQOXyRPDGrTY5Kw6fVrhpYZVrm+auETg8Mb6GF\nDnga\r\n=hChV\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/mergeConflictMain","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","browser":"./dist/browser/mergeConflictMain","engines":{"vscode":"^1.5.0"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","_hasShrinkwrap":false,"readmeFilename":"README.md","activationEvents":["*"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.d6e8feb774_1608166778277_0.47765174355655726","host":"s3://npm-registry-packages"}},"0.3.0-next.c927a8015b":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.c927a8015b","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.c927a8015b","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"ed1e6ee5f969cf0d15bdc0eb44169c4dec52d738","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.c927a8015b.tgz","fileCount":25,"integrity":"sha512-+SAcSiUKgeRoczO4MDFRdfjfoGCnCRbhWpOz4/mdLYIc2k1d81AifEwq5i+03b4VcAJ0nSNXzOF7juOu4yVL8Q==","signatures":[{"sig":"MEUCIFQZoqNn7q8SyN4mmnb5kMBhcQZ9ug0nqPOv73vjvEAaAiEAkvU/AZhGmwn1hOT2LdWnffBnPXPXQOyvjcHqzo3nyTk=","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":155676,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.13\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJf2/6XCRA9TVsSAnZWagAAaPwP/iDE4OQMc4uSVibp3BKq\nNKgmEIfx1D1P9TF149ufX8ruDIenF2CmHriYwVM8KlBy/BiNv8cUYVzYBZXF\n4nf57rNwkkV4Qpg50cO0Fx7tc0HIX7urb2e49YZLWx68djV+y/HfpYJ+K97s\nVlGEQhqc8sPYQaSk++riWZ8yfar3hFNGv6xaEKAtaOq0iynWZ/XX+FpYHyz5\nJs1Y0Pgvtt60HKDxk7lRXlC5KOh7WVcHQPN9o1uhXeppVL1WCfWHAfiFNRgr\nWbn3ATYey/CM0vMUWK6e2eemJtUZo53SAJiBantI/EsBrF9qpPbF8I/rzSyF\ng3SS+T7L7PquufAHuLKrHT90Z0affz3OrKuYyEY4/n/873zI/PwUirCYVkiX\nhOftIBRgIClsfSiyg8DNztS7BHosMgTttxN8sMiMvD9WWTGYAUg8fnr9TCZh\ne28MGHUWAP2dAmOQOySsMUP/SVJdR6OeU4GnEGt+6V7/G86mY5roy9oeCXqv\nMmuigvmsouUXzc+RbnCSs9zvB3S5WOa3F0l4w36lnvtRRhn+VghQV5WwoA9X\nbxGIUTWfAqSuvtkF2GdNc34hoLI6e3rLzffh1hD5qe9+qEZumpzOy9GWWM5z\nuV5m0wSMils7BTiVIwVwvDjSjhnqKfLB7TgCY6WSzwxV6zIz80Zv2y+3/COQ\nHq1z\r\n=YuDZ\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/mergeConflictMain","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","browser":"./dist/browser/mergeConflictMain","engines":{"vscode":"^1.5.0"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","_hasShrinkwrap":false,"readmeFilename":"README.md","activationEvents":["*"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.c927a8015b_1608253078787_0.8002861208452832","host":"s3://npm-registry-packages"}},"0.3.0-next.09ca712fe7":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.09ca712fe7","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.09ca712fe7","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"da683a8ec86cd5c47a7f01382839b9f39e6e8603","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.09ca712fe7.tgz","fileCount":25,"integrity":"sha512-Thlin7SwVvDlazxn/fTf38os482TeDkIQEsVxsRmggBjpKvca7leW/u/o6YktgKheDNgDtzkn0J8faDQNW+Z1A==","signatures":[{"sig":"MEUCIEofJFyxFTkpJfpL0ivfXAvF17aRmxOqSFoedIzMOT4oAiEAsBCmVoqGvHcyc0LrGavtjapkxDvCpOqrOPJvoMw8zZo=","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":155676,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.13\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJf3U/3CRA9TVsSAnZWagAAp+kP/3PggkLV4jPFM/Hg7paz\ngxCxUlhXE7AGTFiVd1q2wtXBHBimbmIIG27jNiOizrFt65wqSu9uaTJw/eBy\nGzhHN5M8A/M1BUz/BClmZGhJdPh0PvgSRAk4GOwad6JEefrGSbdbCRQXzVA1\nvtv6W3n7Kx50cjL8j3Pd7FHpj/kNU9YGc7DABQQcYMUXh49Mzw97ltGR8qQt\nyinwxUTfzQx41UZVm4RtOhsE4WR20qxDkhcCvopYYstCP+/gsQjDVxan3qRv\nSdAjE9GsFXJCLZ9sW988XwbpQ1UqCWGa/jZ+E3iXEeyYN4mmWU05h8IL3HIv\nqq8GFf1623Asqfq+i7GmkWPxcR11at6ndPzaYzGrbQKSlKRnBeqNoZfpkXm+\ntWA0KK/O8r+WUHqAQauySAULWfZo4z/79JXM53xSAR16IRKdcNG1L+b8JPZl\nn3mMxA0mpm+7WkE+wwdqgoyDGswiIbZCsUoytcMrjX3ORGt5N9umxBmVnpmb\nEkxwwe+Oy3xVr5ypEhORyNj4fEmBawswik9b6c9uFkho8xDAOHi5cJfnry9N\neyG6RYVUsk4ua+hr9RrtE/Mpo/T9/kDPqeNSvpz5GNCtQ2KMELXQ+gOJ5X6C\numOKqpbWIQK4LpckZ5XRJ0t0jPJqnGLRcawA6Ewrc4ieGwhBFsVx/QyMOr6j\nFPy1\r\n=g7Ez\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/mergeConflictMain","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","browser":"./dist/browser/mergeConflictMain","engines":{"vscode":"^1.5.0"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","_hasShrinkwrap":false,"readmeFilename":"README.md","activationEvents":["*"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.09ca712fe7_1608339446583_0.8306019931896746","host":"s3://npm-registry-packages"}},"0.3.0-next.ec6087fe18":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.ec6087fe18","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.ec6087fe18","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"3103dfb2aeabf91ef2e8fda756f7d5f683b0690e","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.ec6087fe18.tgz","fileCount":25,"integrity":"sha512-fW9jF0a6bc58W1I19DKUbnPiuWnvpqFn0J6AvcGyVghICBvh6jH6/3RVcqJ2Vow/L8+Ify+DB6Nx2c/fczp5dA==","signatures":[{"sig":"MEUCIAI0eDy5U0KZlAMFt0+T8SRy/jnyxslhSiplNKuNHxXoAiEA5m9e1rouebNtbLmAn7O6i/cTcu/8XPMupm39xZyWGqY=","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":155676,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.13\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJf3qJYCRA9TVsSAnZWagAAJ2cP/jzb2YV/Zq9Omib/jArV\nUQmDj2rovAKh3IVBz3+rQHZNDCUYNkqqzukWbj4yZmAcBl9UHbyKwxzQNvhy\ndKUo9q/ruq7yjMS9AFwqWC+MZ1NFRDTlIHrq7neKNgpGI+XpJt7lQ2hIxjzG\nfFx9EHbtVBK0WKST2XiEr2w8NQH9NcQZYFTlWOGH/q+VZxqQULkglYrLJovc\n2/vnp40h0jL+AR8LcZ4vG2MZ5da3qJleqTxbp5pcghSfBfjaIUe3dnYhfDRG\n4Wucld7y8WhVp/8KzESHjZ1L8dkdd1OKINS5D+4CrJAogZqiCy2YJlz/jGso\npOchJd2iBCXisbwwzUP+iMXUZyYEIEvMBxSldwg7PjAFg4+lsr+akQQ5v+S6\n1mOuY9QapfFgfmvzkStU6a4xolGLlGc3eSg1kfWTQo8CBUTXEWZB9Bal1Pne\nlH14OOjZwRuvGO7eHwkPHYTaVTIOIyaEgUSNBOqeUCSMI0SUP50KwX46zvdW\n11NcZwZrnZ8n8Ct/nvcU/TyYd9QtROWyjfECM7sJjwNJd+XuT4+GtdReWyoe\ntBShtitx8Lm48rrRcVjLWU/pDza6X+8KX9S+6aN37Dd6WtIp7NxYDWgIKIuS\nwJinGlrKLU+mnKJYUWYsLebsE6TMakole8qhb45Hr0QtznlOnm7PwDl6RA+C\n9InK\r\n=vyiK\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/mergeConflictMain","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","browser":"./dist/browser/mergeConflictMain","engines":{"vscode":"^1.5.0"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","_hasShrinkwrap":false,"readmeFilename":"README.md","activationEvents":["*"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.ec6087fe18_1608426072465_0.5161444422591854","host":"s3://npm-registry-packages"}},"0.3.0-next.6f11d34f67":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.6f11d34f67","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.6f11d34f67","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"031b1a90ed37739588ce3deed1825f878d88066b","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.6f11d34f67.tgz","fileCount":25,"integrity":"sha512-TeUHXWQUufVmOW3QUk0eqw/AIVdXIRpVWvpzV0baMpjmjlfnPrcoF5QkfzGsv41j6U1/bogFybFLM5TmwC6oPA==","signatures":[{"sig":"MEQCICQI+lASwrKE8a7qLaNY1j7Wlhn1uh5+RlGe5Hm8N229AiAbTW04CPdt0y+SEQ32ORsYyExGGKDSZby++polWidyng==","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":155676,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.13\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJf4UWUCRA9TVsSAnZWagAA3rUP/AsmJweyK4zKDOjzjWd8\nUkj0fAxNvL1DYuaCugxRRwDAbBilXRKX47N93DllEFVDq4JrEFOhM9l02W3D\nD5uWv/pddTzBxmdoK7kpQOAfO89BJwZIlZ1Nyb0ksgYyKCZNZWFgcjSbRWZ8\nA5f6ffrjhXsaEF6i/DoyXOafdBAHb1k1YQoiRrB1j79Zmgqup/wkO+YV4Ygl\nMZPETbDearkbOjLLcNkrbCFj32QzVmOw1Suha1ozFhQe8IyjOP5AnvWsb48Q\n/xkSNa1lSawA41QPa3sbMXgbel3YXwffVkntxiy0RyHBuHfI/3YUUWfsIulS\n0sW2u4aQgBiCvKTSn2BJb5Kq5GSYWurHKerm4/KBgwwiLquoAwh1g0B3Jz45\noi7tx3Jb9ZK1eZu6Rgbgm2dru/R3gKouzxVfy/5VFGfut9+ovptlLqVQg6Sb\nWindgYaAVMyp5JDxkBPQjQuCyK/cGRS19Ga5etEHITH9OZL8TwNO4W9IH7et\n3iI171uvgYmrxz3JsJpU1hHlqnVPrgrXOye+quxtEj/Endj+K9KQBdkQjMnt\noTse6Em6qnwGdMTqQcgxoBju3z4qgdQyL6IuXorjzfJu/HH3sgR9JXQDEbJD\nRPZCQjKAH/xnaNZ9927KBiu5EYYrGgadnO85anC8F+jHe62pUtH0u8/nhMFF\nXB4r\r\n=Un8L\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/mergeConflictMain","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","browser":"./dist/browser/mergeConflictMain","engines":{"vscode":"^1.5.0"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","_hasShrinkwrap":false,"readmeFilename":"README.md","activationEvents":["*"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.6f11d34f67_1608598932448_0.8040847412258003","host":"s3://npm-registry-packages"}},"0.3.0-next.f98fabae6c":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.f98fabae6c","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.f98fabae6c","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"b57340bfe468b015f9a9d2ef661336222e5c957a","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.f98fabae6c.tgz","fileCount":25,"integrity":"sha512-2L+XC2uGwBAvbpqxoHR5aOhkOo4U0AW4dXUx5YYP1L7Wu7rL1LCQsjW4xpzhxjyvFMza0rzuSgfyg67IOIDFFw==","signatures":[{"sig":"MEQCIGnQAZaIM/rxeNnVNM+n+vbq4gaD5EZ9Ekk1VFzrSPyeAiBguNeG50q7RBKkRdLBC4JLuYlQRa3xCZcF8NcYLSAlUQ==","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":155676,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.13\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJf4pdoCRA9TVsSAnZWagAAlBwQAIwH2dBe7ZxZQb4p5ZZJ\nbEyhhz2rGSZqB3agtRgcSd0TI47OZ9Oih/PgwXTI9hx5EVNFOhvr6RYb5nIA\nAmtgeBXB24VIbWw61klwn+Z3XmNbJZ592C52UU3xeF1UoJ5lbv+H722aPwbK\nTKWwTNFXJwuB3Y8pxR5IK8OVWWGeV5FmCGSNBz+zSp1zo7L6TNu+EAna/fzG\ndLup2av30HS0DiKwotxnL7oxUAp1coD7NPN8vgH7wKfJ8ZulrBlp+/KzMNVc\nDV9Tc1nQrK9AA8aIZqo5OZP1KPSeEhfcp3uoFwZIq8PWQORQ/L+hAVK0rA9p\n2twJ/bsIS9mayF2BGRSSokUcZMTS1qLYFyH37C3F0IbWVDG6Gu15kz3PRd32\nRDblxQcFoj8hoHe8GP1dFnzGvNp/u1OrWADEZ3vqnww8af6blTRrsMnkVhxv\n6DPR5TnjlZn9alIaHCmmmvsxUuAZuysA9Ts/l5YvI8vBzQhDioCqnRPGg4bp\nI4ECZicARGQN4tDmL5hQV2oPVQnZtrfmHdaX7Wg9h8QaDiIbKBHqEPBTSxJ3\nFvhkELjDKmcIxjJS2WRRhAQcqix8BZIS73ZEAijHbrcKaTA49+d22H3GuvCy\nJdhrlW0gjZ2xIe2c7vSvYahnewKsw0cOLBjlZDzo2Bi20YmSXG5HaTYxXyJy\nThWD\r\n=6yvA\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/mergeConflictMain","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","browser":"./dist/browser/mergeConflictMain","engines":{"vscode":"^1.5.0"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","_hasShrinkwrap":false,"readmeFilename":"README.md","activationEvents":["*"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.f98fabae6c_1608685416235_0.8180129451919571","host":"s3://npm-registry-packages"}},"0.3.0-next.caaf2a07a9":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.caaf2a07a9","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.caaf2a07a9","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"cd2ab994da8e1d45798f87f62d66c4760daff058","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.caaf2a07a9.tgz","fileCount":25,"integrity":"sha512-lcBy/nTu6CIH4iGOURpJPkkTFUxwteWq2qxVa1OREsvRD+8KZOjL+3812M2Rdl3V3vPVbyk39fzM6ypaA1193w==","signatures":[{"sig":"MEUCIEoQq3AV+DrOCNLWzVzy2T/jcQZmu94oHL32R/8LQH/yAiEAuDvDb+VT6bWfGUkYAY7sizv//Cg7c1OutbXTyuTprIg=","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":155676,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.13\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJf4+moCRA9TVsSAnZWagAAjGUP/1ohfxVldH8muFNSPiLy\nWCzD+r3q4lsVOuPM9riv/DSf1c6NA59ddAcRmPZsxXVrUUYhr4JfhdUoYTNu\nDAck7QnEVApv8QYp361/g9TdHaXXPhCtQihSsBMQjdUD1txoBMSd9gc1nn6S\n+8PHF8rxhOdc5Oy4Jh66+M4oSpx4AChWJVMo4aMFLYAH4Mj7K4KJzEBVgMwG\nq9ioi1lUmT1hlk5BG7r4D8e62vDepC93EyJyiYrE3qFhl8wWIA0EUv700xr4\nCEYrUox3JEqoEPoImL0uwzJjlKkMwCGQeKVvtenc4X2SzzZvcDHsxUScSg6h\ntbt2dJvmiYXmOa/1CnUZeuxM2fHyQmmnGWXJ1gaSZJEMzv+Nsk66MuIO5vCn\nbtFd1h7lUbXqyDRHxo6aybomkLcmN8H+V8jlOfUxJWVTo5NDXxG8O9fxBUWj\nmQ3V0EyEvOvVvaMAwaKP1VHIqeWGVxX3zAp8zCqbQUpgY485bDb9/n9PK41c\n+f9IWIZJ6LI+Qmr+9H5PMNIIi9NAPaYfgVVJCec6Q8APE1kB2El7rvYWQOxF\nwhjis9fgVpn6dVqnBYGqR1mkciDUpj8FxC/D4gLEeoGxFRMPZx1y/yPVUV/O\nam484JV4oOxB2QmXHZrZQe+7/t6Je4Ko/lZpiSqhDrsyxQyrWJhqx+8Yes6c\nTGdN\r\n=aEZl\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/mergeConflictMain","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","browser":"./dist/browser/mergeConflictMain","engines":{"vscode":"^1.5.0"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","_hasShrinkwrap":false,"readmeFilename":"README.md","activationEvents":["*"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.caaf2a07a9_1608772007719_0.9085763157623781","host":"s3://npm-registry-packages"}},"0.3.0-next.5162c8e856":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.5162c8e856","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.5162c8e856","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"6a371e0854dfe5c69d2d2cd8a73cb11cdd716c5d","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.5162c8e856.tgz","fileCount":25,"integrity":"sha512-sZKgMbAnz2zhPkoNHkHvPY41OemaFAa5GriIElpTZ1vC4c/zar0ExmjVpUPXQS2ND/thPLdauuk3/o358hwglA==","signatures":[{"sig":"MEQCID+47k26CC2MPuFY7u1r2roZAk+5ixq6D0gSvFh9UC52AiAzwd/0Rw74RLvcmSb8+Yb9QjR8iI4S3IQgnZXDxcn1Sw==","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":155676,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.13\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJf5TrcCRA9TVsSAnZWagAA3aUQAKJ0EI0/mk+/j26KwkN0\n+NWWKxXwuLf71CaAvi4o4rCcNJ1bRAUcB8aQ52Th/kRzubSIBtilwBuuZ/DP\nWW5L5uSc3eKZLP9jdNa//55Q31egkA/jebhH5g8K0oRl2DFYIMYJoaorIpnZ\nfeZPEwKUbHLHOL+RIX7dXSTtF/FqccbB8nydhBjTuhW7ncEpRWirNjEkpmug\nlv8ZwqGspVWPDZCsX23woFpIPYVtk+gxz1u8BnzXfl0bXSQdre71vkJaA9fd\n0FzABDesAYYHuVbGuAxIJZWYzDHnwzxwt1XSZ403CCI3g6KJAQLLU80LpWAb\nBdHBD2LJqWQUihcBiuKJW+wWKPRA9JTIBkB1t+TVCkz007oHE1X9PIqRxx+v\nY0aE7V6SKx+H/Vsky1nfAL4E8RYze7QSflIBM7SycaacsDePqU8ozqyNqYA2\nNLQZ5s+dK2qcysxdGJvCgW0ev3QvOGRPrW/hg9RBr8lZGBwFOTVe/DYi2He+\n2M8URCCrJf/vduwXniezUBgF64TWHAw8xWQSibIXl7cxJVlSMMhPsCyMgaNN\nfSNs06rE4OQrzgKKEHQ0E5gpzJJE67+P8edPyy8m1h5V7IvrhLtwXz4vffzZ\n3tfSVSxMKDuVpitQh1G+Ex25cImAnK5q2Wulpb7hM7A75+DM/GYxDpTOdxfA\nzz8z\r\n=+enk\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/mergeConflictMain","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","browser":"./dist/browser/mergeConflictMain","engines":{"vscode":"^1.5.0"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","_hasShrinkwrap":false,"readmeFilename":"README.md","activationEvents":["*"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.5162c8e856_1608858332282_0.7577570228712707","host":"s3://npm-registry-packages"}},"0.3.0-next.15561c4139":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.15561c4139","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.15561c4139","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"678450e5cf75d69e9f8275787f0cb07a01211acd","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.15561c4139.tgz","fileCount":25,"integrity":"sha512-RgsEoWabNEUQXr0KRpubdNZb9bzMnOcR9ynsGVmp+57ki97Fyja1opj18dox9MC+etMg5nAwZtY3ifWiBC8qUw==","signatures":[{"sig":"MEQCID3CzlsDSx/9a/YQf/4mhBW+5g0N9pbEEFb/57Pq8Y5MAiBmRqFxHx8uiD0V8Dp9JHOlGkjeOSv6ZmsYF7tcv/F0TQ==","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":155676,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.13\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJf69LfCRA9TVsSAnZWagAAvegP/2exUMuGZ5vYUk2Az63a\n/CRO7DPHX1wLl0JXYzPab1XcgCuRufYMXMFhSpT5l1jE7l9Qlo4/thuvtMhh\n2DDPcaAP5Pwc0VzmGGSy0X/wPXiKxJWkEAg64FbsMa9AxiZE7HHhhmIh5ryi\nMiFUx4hnmiCHypjedRMOO2TtrxeGjYF6EIhGitoEn96xCqzVxOwne2moVK0I\ns+2A1CLwCYpJFM/lZ7hMgl815n8eJLDWcgjHsGb7H/iChcTmdJKsCHfgetvk\nriOatjHLFsg3pxxbDJB1D3u3OjYaumHotAMf7WrIhByH+ni3dqjFyvGyp93M\nso3NwXhkJpDhaZX3k5zIk0FJ0Qt0kQXYKjTWeE74qBlJYYAiYsV7ds7hNiJu\nI/mkcLF9St+mzBlbgDpN6IUchK9XRoSTWQbBpCv/o55oeXtETj3kEmDFfUjd\nSOK/wCx15X3K2+slV+dN8H1xi11XygIi2wtvb3l6CujKwbtKjcMT6iAf66f1\n4r5eoauIXBaHQAIp+5p5yrjvbqfU6ktWEktl4NPrfFZEipS71I2Ha/6i/vP4\nomNBRRN1RzUqbiFsuaWnhwwxjmvxwVbpDssq2d5BuXExpPYefd9+vhHvH1H+\nztuXTbfoW6+b/0kDY4a6W7NXWa0dH8onPBtG/FhUBXx/NBoDS+T14wBW4KkH\nLHby\r\n=S6Px\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/mergeConflictMain","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","browser":"./dist/browser/mergeConflictMain","engines":{"vscode":"^1.5.0"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","_hasShrinkwrap":false,"readmeFilename":"README.md","activationEvents":["*"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.15561c4139_1609290463345_0.43171153438888665","host":"s3://npm-registry-packages"}},"0.3.0-next.7242082983":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.7242082983","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.7242082983","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"0b8b38298d7ab4333e0df505bc1d869ea81f70bd","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.7242082983.tgz","fileCount":25,"integrity":"sha512-G01MS1NBAEskmtYAJmHpW/CPAqY9RvlE8hInYN4NHaYA2MlbTM6Kbabz7FTxlskJGkyEAsrJBf9w978frHXGEA==","signatures":[{"sig":"MEUCIG78uAwvFoIW+1uTI53FJeIlDBFIzA8H25aOzfpcIVmUAiEA9iAkGKGK6x0gAgfMaLeF5cPR+KXyTLXoa3+cIRWBKEc=","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":155676,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.13\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJf7SUHCRA9TVsSAnZWagAANc8P/ibIGWRn75vJyYZVkkjs\nsiIl5gqs+ZPdkg4VEGELxHETBdZ1Tq9Zc7wvG0vFO5F1H8PhYRMyzPeKSHmu\nj7tOH1cK6q+1JGG8+w7vRcfPQWGtLjSYKiDFnitHDH5IG1r9WBxMVa1bNIef\nsnP4qIMX3/X6fRA80+TgeYSPOQCCoPq0csGW7xci7xTOSUCTzsJsfyUUY+s4\nQY1B0ZFLSLKgAkapu7yJvqtRj7o7h7rDmWBNWHNXrSSmSGJaFxszyShEvJLK\nlCtG/yoTkdCIt1EWsqaFgU+mlOkXxrC0RU40OOg3NfCvUQG6j3xFIDbaRTry\nQWIEDjmxj93qGPoLufAZVU2bYGvqnVOuAsrjAQtsxa8NBesOMBpbfyeZmaXB\nVPvGRx7SmKVdaCSo2pefeu6WedG2MuFoqPp4oSn33S5exbKLL9TkFydMtbFx\nLFSLTXhFd0O4LlZtI0hoQET2qOoq1LEcPBQn+Z61dANkwCm6hyJQv3ybXIgV\nEPHltxCnS52iLz0uOgriJOgmBaqjXmx6kMINe/pdrIYsFHA9ExDOx/hsZU9r\nhvFPPXbgBJVwr12nV5JK23QloXO03O5avtFOvstfa0XilWnJ0GiluopU//+k\nzj/3IpYYh6lJsdA6+WpVUFn3NaAZZyj0nsu6Inb1L1gplo4nu6AjkdGV7E1D\nNvQE\r\n=JKEW\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/mergeConflictMain","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","browser":"./dist/browser/mergeConflictMain","engines":{"vscode":"^1.5.0"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","_hasShrinkwrap":false,"readmeFilename":"README.md","activationEvents":["*"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.7242082983_1609377031406_0.7520826947701211","host":"s3://npm-registry-packages"}},"0.3.0-next.98106c48a0":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.98106c48a0","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.98106c48a0","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"7e1fe6f01f84a50b94412d8be00dc0a13791c658","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.98106c48a0.tgz","fileCount":25,"integrity":"sha512-7H1EfLp2ZeNPGJ4aN+AZX4WiqE+0Yd+dw+W/AWWx+BVggV37VKxiyv7NUS0kRTJcFdKMOrESPHTMEVXtAPVsFQ==","signatures":[{"sig":"MEUCIAJVL41vS9LngYBNMUjo1rY82aFS3iqE7V1IeXoVKYn4AiEA3EE7cNxY4vBnKmxhrAtFWTxq+BlG8wpbGR7od2R7v8k=","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":155676,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.13\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJf7ndfCRA9TVsSAnZWagAAV2cQAKLYLgVUhVkMW4fvNA2k\nfGHprNCdwMxe/w4GR6ZQ7v8HQ03js9HjzZ4gbN9UADnaZ6jzCG5NZIJIxK53\ny7ToskFH9V1DapRZncsZDocv8caeU1DOHyM55aa+oZoDqtzGGKJoOpp8wE3W\nlAt/D25jPVycv35KgW2JC9GVXueZ+m7B+iyzGrPnCR6EVBp6LpOmCsoa7izL\njuC2GU+aQWnMjWRK2YRJr3KxcDD+ZP9RtaZrI7XiGIYtCSY/b3QUEQ75/dAs\nyTp1unZPpRJKv5nKz5GVQQXQ+lgrutrhh1y5CxvKWzN36OBr0TPJto85DB0O\nrRwa2A6OgP9SV3u+wrlLDP0iF81VQROhX301oL5u4a2kwNT1ArSeAsKhDzjz\n3Cj9WCa0PF2mvJmwsVaZZnWqfHFc0YL0mX3V7V0B9Sid6TqYgoJaisOcwSse\nP2nwc0es8X6Vb7YCD6N7AiE4G0ikeIUkaeERIYjOYDPSpWs0Bcv4r4tGCYkz\nYH8IDfWTQGwnRE7XIAvThCwxCbHvgPC4ANNcsOrd9Rz8srFkvMqjcuranjQI\n4Sy+ugUSW9F2tjdZ0Td50X4MJ2XikH0DLAUafRdfJ4ymgiODuBdvH+/IcZA5\nTJbyiYquCGCRZpPZ9crZ3npzcJRTY7/Cn7tSdFSRrqcoJZnhFSCAJOjyODyV\nNHeM\r\n=OHLu\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/mergeConflictMain","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","browser":"./dist/browser/mergeConflictMain","engines":{"vscode":"^1.5.0"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","_hasShrinkwrap":false,"readmeFilename":"README.md","activationEvents":["*"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.98106c48a0_1609463646739_0.4278934698055248","host":"s3://npm-registry-packages"}},"0.3.0-next.4167837cb8":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.4167837cb8","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.4167837cb8","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"cc3f5b638e6f1f4ba56ead4aca0bf8ebff4cf8e2","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.4167837cb8.tgz","fileCount":12,"integrity":"sha512-hSYCRBaL8zpu8t/cDKbDHljwcQjUirjFfAL4X1U9MByd17aX51Jy+BgXt2DEDj1kUHPH/HZMQfk0m8sQ6KCHnQ==","signatures":[{"sig":"MEUCIChnW+k45xrXlATPWrUt/YVkipA7tPUgTuu+6kgzMpD7AiEAzvKN5jWQimVVJVXbTfYr9JL0fvfcDDa+YrtYYizZ2T8=","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":106246,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.13\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJf9Q6RCRA9TVsSAnZWagAAZvQP/Aia2wbDp77+brzNZ3oY\nSIP9ByW2h4GoumBhkkqfMwgSNYEAqy2v2FH6m5BsCbSu1pb1lya+2norvZWp\noX+hvqfZjPqPCCvzaPSYlsx7M5AVzaRC9B2fuKTXmuVepTHmpgymHnxPI8W7\nungjQSj8Me5mDGJiC9twHSsuKt2ZjRiRwN8zEMi6t7wjL9nkdaWvMMCTZMoa\nmOOJSUYPK0jNnP3LmphEcpDg5ia7GvkC+KUxseQXJqmu55xb6QkJpfiEJc2m\nAVKR7Spr26DJhOskFkYEYyHYob4g9yWAm5FNeb+5mbzJrIiVF49AInUM7dva\nj4UK1lTQXIblZbina4f8+c3K9XEQBSfE00iHSILF9vF5S3+5tjfJ9ZLLVNRc\naSGSBL9EKN0oKpvhPKjZB53JWRbqerT/h96HyScqS8B3BXjNFZS7rX6BIWI6\nGKdWnRZ+jUdhTKyZpXBvUiRWx4RPEYl+08TYMJ57f6iee7nL268ywVyp2E5b\ne1IrfFdhFdqRQCEK0llvEafUb0SITOcgAmVfBg6kbhrd6itILtEZ3k5LAbN5\nJu/ZYvfe7rLUHhpYQalamqv6pRWjRXV74oefbSiK8ZwYVV6KEum5VEZ9n/+7\nnihfcOBeaDK4ENI/NUU2LNhQMfNbz462Zx3+qiuHF7h5nGeq2t8ZfQnwETF+\ncnZ2\r\n=lRBj\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/mergeConflictMain","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","browser":"./dist/browser/mergeConflictMain","engines":{"vscode":"^1.5.0"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","_hasShrinkwrap":false,"readmeFilename":"README.md","activationEvents":["*"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.4167837cb8_1609895569183_0.21187563709990553","host":"s3://npm-registry-packages"}},"0.3.0-next.ea1b3f27db":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.ea1b3f27db","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.ea1b3f27db","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"b9eabb0ba7cc3e58e29c12f149a0453eb8bc218a","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.ea1b3f27db.tgz","fileCount":12,"integrity":"sha512-LilZ8lqb01q0qEcT9CZxW7U96+6SQz3SGgcN43PRTTllwmqCbBtcVaO4m0+uGL3nFBivcZS9L2mrwdHomPNGMg==","signatures":[{"sig":"MEUCICGt0BALnXRA3Hc1ScsqdlaeSJ5J3JY6SzLkg1gLy41oAiEA5ZuwGyDtbPPMX3pxMg2LHN5g4v6l5+dSm838bnTEtFA=","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":106246,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.13\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJf+QRiCRA9TVsSAnZWagAAnR0P/1rRUAsfJR8IMHbQYiz6\nmdlY43ZXoWo9GyWp+s7KQkwTc1taD6GNFxwCMwMiM5T/aS8BmAlm96D17Rhu\nBY0hCL+bzGuF+/6yAM1fQDud7BaJImBAZPkHKurk7KJQwXr3nQbc+GUhjEon\naM1GL/Gqi6VXzbEHm1uE8Vgm3rf4Hev/nrSw7eGU6wYDUvy2pP+UG0TPRnxR\nLuDdek9LgaE/9uH7d18mp//9K/Y9sri9TNnFk+OGvNkP/v/+BTFuyLCwOA0W\nhok5I/gPK5IfgnI7fSFxzDdFRAyQpU1LsqhMkcEu/B8ApyRXe/oUroNeLBLM\nLVh8D4l+kA7HxZwGeIM/uy+4rKQSbWcNnPRe6SpTPPFfUek31VWC0ilDe4ON\nGqdi7yAUqfooAZKL4xPA6pZsjAyKhjwOJ04BCAYi1kllIkOcxPGSABlg4LqF\nupHgY6CfLfoI4lPIa9boblZWMyJ2IDiu1LMpcpodoz7gXDVuEP1Z9DrarLM2\nMIg7F2b+r/jIojXF/3zkfYf7BbuEpsQtKeOwJjC2rdBEf8prYf7aEeHZL5O7\n8YWgNtDJZd4WD+U1j5rv2jP4J0B96r+Kc/pWDbXe3wcRI4uaqMVMuR3AlC07\nDUWEI7sVEZ/6IpJ6VsLo8jn+Q0HwJew1EKhJ4902MudfCXs8yZDCyxgEccZC\nrccr\r\n=P0/E\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/mergeConflictMain","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","browser":"./dist/browser/mergeConflictMain","engines":{"vscode":"^1.5.0"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","_hasShrinkwrap":false,"readmeFilename":"README.md","activationEvents":["*"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.ea1b3f27db_1610155105563_0.16029905312374404","host":"s3://npm-registry-packages"}},"0.3.0-next.3ceb3a100e":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.3ceb3a100e","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.3ceb3a100e","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"a7f4eb0f553f66d3103d0dc918a3f0541fcc2bf6","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.3ceb3a100e.tgz","fileCount":12,"integrity":"sha512-MEBpTv/a3aIAzrCo4pgYkoPBFGYlyGEQV/GZ3fcnqXYNbOsoX2iAg7y1VlJLKvJvP9/z/I/qNfonwe9ePhwBUg==","signatures":[{"sig":"MEUCIHj6oXhdtXVLCLfPR4EY12MFlD76GH0833cGHMH4tK/MAiEA12UsPZHEf7T/TSn1WyqKEO1Tre7F2Dkma5KIdQvqddo=","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":106246,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.13\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJf+lYKCRA9TVsSAnZWagAACmwP+wcWAK8OzZ81R0okWDua\nJQN6G2XioBtvy3R7pdxE/rnDqrFL7+uLLYSVQq+PEZEgQF29+S36NO7Q2To5\nWlymOIxo3k032zD9lVrnbfQou76QxtkYxPDA+uXNkRdpJGrxvm8aNVDaz+OL\nIHMUjiOcznox2DXCEoUhu0xc0NTFzX0L1wUHqKNQhvKGFIiqfuhMU4YL2opm\nUEk0uNCVrD83OET57uaXihpLKA7bP4uk5KLrt8PRRumHlLlNrFOkHmey36QA\nCdrjaWtY/U3PPLZcUTcqHMCtX9sYI94bO79TsSxUEr+AABoTzwJrNSFFGOzh\nTsJVcZ8Q/2zGptzD9PagzRMAHdHnScbKOt/ymuYI+inqly0CnzjUf4bXGp97\nNOXFrq2i4lGvjA/pTSgdm5cdkNw3k2UL8pIzd8OBi5xvYzOc/LfEQf42FJlE\nZIHz3D+EyOG+fxmeWEtMnptIX6tYpDCH7emA9tyHEr2WMYuO71bfglulPrI1\nYRLFgdUHGFcmIeVeFmOroZ566fwiKllI/6l4pcshMHu2xUaoVSHayfUrKHyq\n3jSLxq9nzb59Z5ZPgzXhT3Ktf0sULAecQV627EFWURmoe43dnKvZ+J99grr8\nyyqEoauATXtby/q3Qe86j445S8BKU7mOehjHdyZhxOeqXY6+yDHzOqGzKvX4\niABG\r\n=BLHT\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/mergeConflictMain","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","browser":"./dist/browser/mergeConflictMain","engines":{"vscode":"^1.5.0"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","_hasShrinkwrap":false,"readmeFilename":"README.md","activationEvents":["*"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.3ceb3a100e_1610241546369_0.03682787202195681","host":"s3://npm-registry-packages"}},"0.3.0-next.732d4ff89e":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.732d4ff89e","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.732d4ff89e","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"993bdda914eba7398af7982a1275cea7c50acee8","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.732d4ff89e.tgz","fileCount":12,"integrity":"sha512-R+0Z6/4R8nhGMkSnGWVvVLutxtsRM529HUxV3I3no0uWtlbEOMwP7Pr+kxGMHKXjqH10sbtBisbcqnhLvZ9cwQ==","signatures":[{"sig":"MEUCIGPASQikkxFvtP25S9nF5zTFl5A3ob5r/OANSf6Ki5nyAiEA5CdzuVvEE7AwQoHJsGq3eMIYBlb4u/hvnp79Jif92/A=","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":106246,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.13\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJf/PlUCRA9TVsSAnZWagAAZfQQAI+f1B4KH8NJcwXjJtDg\n8nAc0gEduP2atmFFgIpSeFheMcAlKd5yZyTPilegCoRn24HPTpeW9r6xT8Jt\nWtIuu3qYqt8PgcU8oHxhkZAoqoZ/h9HhTMLc8lHioeDKmqKluJUyQRfhni3u\n3kjq/mxuBA/igti8kTgX1jqa8166P8KULlIxiVgota2uILqW0rE+jd9vWa4W\nn+hVaOyHbJbArxgODfwj2EhtX44feZH8jMRBknOvWrgj+DRrtADLEGjkVLF0\nYgkmA15yo+zotnDLKZehOlLBifUFGFkTxB0QvF5xaSJGXb0qn23nC3XLJl71\nBwqLKHj5lQobPdAaXBJJ1CPxnVToxqaQWedIiFlQStMG0YGTrlRi/4l/vO12\nzEcyP6yNqvuZEiymr7CmD5hETa6b6LoQpJ3FqLMahTdqN3lmn5lrQVjqvhxe\nJWgiU3MS1yPKuCOUVUOhIRIplP5VJrqLaGjfSqWRPruze51aa4yju3Pn8qM7\n/7DBtTuukDCHQhkVJw2sFLz0cEFv3j652FJgVGlmLTCgCEeAFNZ1haADKUr3\nqlFV5BSF6qhojnvP+IchK7yHrCpy1BcWtFN5MhePpiOvX4F16/jeiFh4KJL0\ntBLua6zSyE8ytF84d4DzjqXeIIBsYSdYUZiuKgVXVLsMJJ7C2vuBwPNtVkhB\n7guJ\r\n=LRk0\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/mergeConflictMain","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","browser":"./dist/browser/mergeConflictMain","engines":{"vscode":"^1.5.0"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","_hasShrinkwrap":false,"readmeFilename":"README.md","activationEvents":["*"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.732d4ff89e_1610414420271_0.07393912091220156","host":"s3://npm-registry-packages"}},"0.3.0-next.b6435bc424":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.b6435bc424","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.b6435bc424","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"54b36e5d960d840d9fdee00274dbbdcf679c3a19","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.b6435bc424.tgz","fileCount":12,"integrity":"sha512-wzJZ8Id6+Wtbc2Fp/RWSPYDSTRX+cXwhMZ9slvV5tyX1DLsi93e44RTBXc9Zf1+akFh8vKddp8s5c9zzYxWE3g==","signatures":[{"sig":"MEUCIH8qjbvzweqOJL9Byd9ZGaA0tcgDyaIEXWsJbmCNZXNmAiEAxLfs3askxdL38wOhFUugUkZWG5vn9A8V7UJRn8rvMNE=","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":106262,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.13\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJf/kyXCRA9TVsSAnZWagAAniYP/27Ivee/glDZD5aCNT0m\ncm1rVveuQ//htV08641m5SS+96jhcJmXMCwisMrtbjB5bfghx/9dDmje6lWK\nfScFMKg4MQ5XZT9Q2fXLb7gERtLD1XURAtqPKf34vn7P9mACBTMjMs3dBA8K\nwHYuTkJaSEsZZg296tgdFahhRpwLKoaZvlWsb25NZMaJcF8/Xqu1q8v/6o8x\nSAs59VK2fhR00WGXyBsuQvJoJqALLcUqymh8fTBC/r6HnEfd/eQQw1tM/dAv\nYOuG7zzrJGUDReK1uXndmCv8nQtum+j2gg8U80bbC1ZPCQQhLiBDe+Z+DFGn\nmltgoLlX49jBxWX6ZuwJr3hoENfNUcyheulvX0oSLjZ/ISyMlXGeVI5CcN75\nM5rObh2iPYq9SyKEy6MZbth2qd5DvubGqoLuuoIFKRFW5z5zHxxRCUrXtSSi\nwG3rqKjsSe7df6/eTikXXpdJMY2UPKZMWNoxD1pMd2G4ZCLQMqDwDGH2a6Rb\n5u5kI2mDIak5SnSVFI6wa2hsehaF8nxu9kHOqrjPksm8zpfhRMv6gUooUUdZ\ngvgVKlLLtcODObPJoemQLWWzmarN8mflPWE7CNYWubXkUsSroNgx69DFQzT+\nxsDie4Udnf2Sp+JkisJJHNQouxnitY0KfiOffcYo+4pel9jrHoy4Y3A+inIy\nRlxX\r\n=qKB7\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/mergeConflictMain","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","browser":"./dist/browser/mergeConflictMain","engines":{"vscode":"^1.5.0"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","_hasShrinkwrap":false,"readmeFilename":"README.md","activationEvents":["onStartupFinished"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.b6435bc424_1610501271050_0.6879492601694557","host":"s3://npm-registry-packages"}},"0.3.0-next.710846866f":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.710846866f","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.710846866f","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"d1c94c5c8008bc52b92e53c1f6d693bb4627f2c5","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.710846866f.tgz","fileCount":12,"integrity":"sha512-LzJiRRndb9d0x3MS6nyvP0ct9NR8/XqpyMO0OkP3g1vf8QP7AzxHDYGmot7GoLygaPhRbf4PAn10SnuxMHHJ6Q==","signatures":[{"sig":"MEUCIQCoWs4QjX+UqPUBRi+DVtJNyguxAv5gklryVXIfXAcBpwIgLpUa+a9QL5sv0PL9kbizncRwMas5BK/tjL1Q0fMTPdI=","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":106262,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.13\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJf/5/mCRA9TVsSAnZWagAANJIP/31SH4ZIbqvD74TxJq+a\n4PakORLnmo58ozLDppDQiKCIRFvMcHM3krXp7QdmkvheVWmjGajWp2jEHZir\ntQEsvji1kTWv3HWLTxDyxT+9vtmdZa87iupwHVZa8YrjZTWweejFL0erIyYw\ndjx+5eBqmb2au/PMEQ5hjJxXvPIT/WxnbM1Wft5RqcvxMvNUkjVksWgpeAQo\n2vtDvPr49zNtToBConRymW3nGP2fPmXMVxDPfKd0e0hPVKRpijmV3Yv3MQql\nCEX9GM0pQT7Nnf1ocEYDOMe47EJFDjeE8trwwFNrXbESk8tT82X9LscFyyP8\nTvalBvWalTB6z5J08CR/80gmxNJub9La8+LTFFvvy9x+q1Rttcd5PccxFklN\nQ91gszOJ5kj6FZl2ssA9slCfyfURP1UEQKHYThbtJWyXPCg5Nxo4MHCdfhJQ\na6Ii91f72cmAUcb0FhzIgxc24VHn+v0DTPW8ViPNmDBRl2KvIVPbDP28fZwi\nbtr/6tbvnyhWTV0E1TbTWojOqvaLv/NBwntK9aSy1O1OdbMTAcE3zVTMmnaI\nGCQI/1iPQEyyfPdu7YayrH4aY66g4cQ950oyw7KGj472+GGWutB96vgyVgs9\nm9LETLyuv9uggYDz7GPK4exKNXf+fy2opuEQUneYgHUOrTDtK63om0Gc9Fb5\nVUZa\r\n=7iBc\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/mergeConflictMain","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","browser":"./dist/browser/mergeConflictMain","engines":{"vscode":"^1.5.0"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","_hasShrinkwrap":false,"readmeFilename":"README.md","activationEvents":["onStartupFinished"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.710846866f_1610588133718_0.9676985935673217","host":"s3://npm-registry-packages"}},"0.3.0-next.64496f8219":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.64496f8219","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.64496f8219","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"68ced85049d84244832fadddd16db3a80069aafd","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.64496f8219.tgz","fileCount":12,"integrity":"sha512-g+wVMsPnel7flvuPK00SvGoTmCvg/PbuzEcxRUW+SobM/eAFolhaGoYjma9SA8nN7VEkjZK3q9a9THSVwlt3fQ==","signatures":[{"sig":"MEUCIQCcsGvLZ2werXMzlfZ+vsNd62at0lX4SZA2JsqX9+xZ1QIgI24/pce0bq0a9r7DfGod6FQKkmc92MRNXJMkv0Kq32Y=","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":106262,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.13\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJgAPD9CRA9TVsSAnZWagAAvzcP/19/QLstR+xK+ANU7ijP\nRT5fdiuPQa2ZCuRP+C6ebU931GuR28JipbR0o/IcyO6mAEXtguC4HNYmSCmV\neirxmld2XRk1SmWbGz5W/DBokRtAxrfZdfH0btYXEKb+2CJahF87d4RqufkS\nP9TMlRDGG2WSEtgjLe5tmVd1DQ6AdjUI3DrHI6PHvhLQnp+WgvKKbPz08ufh\nRGNLVhZERXY0kyUWEz6CoHtgzeRZUsTjRC20iMeL+a2Mv40yoKU2LBhIoDrm\ne0fCAJpE9fqpe6W83jWkHhJ3As6h28ymPXhaXmTRhBPHH/k+vfxMDtK9+eJq\nE6bS5PLuVzOy5/W0CNLsHV0Larr6mC+iPVc1ZKxP+GChHnAGQ2UEBI+lbiMc\nvE1RJm1Ya3JS5/gHJBNXQbRDltiE2CimvfYsx2hFhZTQEqnAqeubVp1MxrGr\nOFcLiCYf2Fkc4W1sMQCajKNVAvo3Z7rD33dHIjwbpbLL2+DeXs/AtFGj7+Oo\ne2H1D+cTxj8oI+V2VSwqlwFTz1dJDQAJx+fV0bAIzHVe0XQ9PQTMWKHGKR/O\nVMHnY/x8Kmpkibi6ehr6bzbYW5gtZOAPKG1ZC/k1qc8zGU67Osgddq7M8v9B\ni6LPD7QDcnw8euxfhp4yUimoDcmG1NlTqdayDl1u6e4np/L9IH1Qg1aU0LZh\nCWcP\r\n=rWsU\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/mergeConflictMain","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","browser":"./dist/browser/mergeConflictMain","engines":{"vscode":"^1.5.0"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","_hasShrinkwrap":false,"readmeFilename":"README.md","activationEvents":["onStartupFinished"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.64496f8219_1610674429539_0.6147099015542807","host":"s3://npm-registry-packages"}},"0.3.0-next.2e89c2d4ba":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.2e89c2d4ba","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.2e89c2d4ba","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"8bff2154a37306896f17d5fc3f27e4c7d5a84eda","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.2e89c2d4ba.tgz","fileCount":12,"integrity":"sha512-U+5rQJAgJTy2n9aMR+XRwl/gZdq2YTr+0G0RIMSvT+psOCp0RQmycW9T/3ULYnxFsMSe4MSJoZ1XqWl4rLtEUQ==","signatures":[{"sig":"MEUCIE4782oNzVBLg8GOO9+w2uxvSK8kwbXGXZXehGBl9ThgAiEApaVU8WIZPHTwUPNKj4C7uY3RntQmvCkRpuG47+Yqq9s=","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":106262,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.13\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJgAkI/CRA9TVsSAnZWagAA0swP/jSnb+56qB6XfehlXYSd\n1WOhrNl6k0NYdBzz+Phxflo2u73XDOBIhWp5nFZMP04R1Kk/QbaAP3RWvNZo\n+ySx0fiOT57QIYmTsrrKjBnIk6Z6Yc70w3MAw/Set4g+XiurXsY7OifkpLI1\n0JVQagRCS0kOIL+oNM0A/15HNxZnl2Bc23P3S/KzWHobi7UMiujIwSE9kLXI\nSh71XAvLtpSuHAK2DTrlP2fagVdhBBHDiemGSPE5JJPY/BTUe0WWXeoTL44U\nZyjm+tPdGRNf2788A4hOEicLd+Uj8ibBywZvuWopbXYxqqMHx2FJadI5AEOU\nJ4DkhT98gRub2yTN1GViItR1JMAhuX2Yw9dH8i/RrvN2rbJ1GD2+8iQIUjZm\nOqatAKOF8Vf60fPXrI5h0/AI8DApNWAvon/dH3YXvJ3WCg0EOYsVFu78vEF3\nIJwRlZdCWt0ueF9JI5VUV3X8AlMNAY32nreoZXbkGkh2AgpZPcax4JpAD6cj\n7jvVNqsOeNwO5qaSILCqumW7aBE2A5ffCaZNCn7LdcByX/nSAmwj6AqcylsH\n4PC7N0WF1chtWM4bFUqxPnJ3bK8YoU73Y8PUL8/HVHxRmtlsZyxm16miYrjp\nSanDBrJUf09t3aVjFUvCrM39M7w75665e1yqqDhgaV4KvllObqabEpgVeNEL\nEYJi\r\n=pUU5\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/mergeConflictMain","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","browser":"./dist/browser/mergeConflictMain","engines":{"vscode":"^1.5.0"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","_hasShrinkwrap":false,"readmeFilename":"README.md","activationEvents":["onStartupFinished"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.2e89c2d4ba_1610760767381_0.008288681833400924","host":"s3://npm-registry-packages"}},"0.3.0-next.eaa959d34b":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.eaa959d34b","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.eaa959d34b","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"9c8868de868d6ab40fc0cae3e1c383c00b36e187","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.eaa959d34b.tgz","fileCount":12,"integrity":"sha512-CybgrlqZfcArJHDSXCKh2c34kl6m/LHsueR/VMpMWvapWjzI0iGNBBIy5jS9t97TWwhck21eO92+sdx/PVyBGg==","signatures":[{"sig":"MEQCIEak42Zk3QGq+K5GPddjE1OL0vucB9T/wxooHHWv/J/qAiBD4Z5PJ3y5zZi+G0qIFhovPEBpZ29AvxS8FlqY0zegNg==","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":106262,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.13\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJgA5O2CRA9TVsSAnZWagAA9Q0P/3EZ14svTA6fRb4VIyQA\nJp3wrqqbPcCynhKynPnUfYfsxOZvMmasrjBxtbxMGZwikrNFbafR1TuGNDAV\nA3cyJGcI9ER+YRQoYtaIh/ToKwvRyxY+C2IJlQe/Y7vMgNohZftzlmmwNPHZ\na2EmBLnlJidWf29CX73URoskgoLOfTVsBKGqfFJK5+3k8kBDOswCyo4kPFbR\nO7cHVPqEpgWhvNyAiCOJ/IOTo8vojOCQrpKafzkPuXfZfUasUJstrIa9zTmu\nP/7rVqhGyJNIy9MNkz7udaDab8q0uXRuTKlEod8Jn7OuYZt8FSTfHU1Sx97S\nNgQGxs5wF479Zy52rAcnG2mKQK+UeD/WQoGPMs1o4nplwZGfky5KSbW0QqJw\nWDBHL7K8rSZCJWVNX/sZC4E3Lt3fr/d1OSey8MnOYiBAQR2f0BFhQ0xfT/zE\nn7W0g0g4JfLFLgTItJHassb52DfnQDfhn/AJg7s2Ef6AcNDIGXd0rftW8jBL\n4OGuSDexQNh962kKKRpmZNLlGu4V+8CoFkLZgsYMuFRmRjRy/gPM44WmNvcy\nFN/5JrFXjQYI/3wLpovaFcX4/MXdE+hMRcwWE1XVLWMonXn2uypPr2DEek4g\nStS1L+ABkYnRLPRcRNADYescRCY/AY6+XB9nQKUX0Hc6PNh6gLCLJ7JSYyqW\naahF\r\n=1tdu\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/mergeConflictMain","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","browser":"./dist/browser/mergeConflictMain","engines":{"vscode":"^1.5.0"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","_hasShrinkwrap":false,"readmeFilename":"README.md","activationEvents":["onStartupFinished"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.eaa959d34b_1610847158400_0.1790539396638693","host":"s3://npm-registry-packages"}},"0.3.0-next.dc58838950":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.dc58838950","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.dc58838950","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"249e65c671d283d8e3324929aa07cfea689bee6b","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.dc58838950.tgz","fileCount":12,"integrity":"sha512-o/nGufhSFIYDbBaMOh4v/N+MfJL3UkKi8WSJq08jF4y/ZIt+sbAs0v+k0ohz4oSdnyq9OWzUDrXhklOxrbw+Gw==","signatures":[{"sig":"MEQCIATGlhTLrAEiFfpn937lBZH5HnbYHMPsjJaDHkaPRaFBAiAdrQndSA8ALqobTWv1epCCkT27DI5qei7W24zX8biQ6Q==","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":106262,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.13\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJgBjaZCRA9TVsSAnZWagAAcDMP/idMfg7B9a6vmFe+nhzJ\nAleyveUCgZwnlBJnQwzUXI/oT3fJvNMipU1E0YYkuAZYVSDR8Ao974K0ZPfS\n21Q83VC53KlvNovuz7GQN9NdQJ9dDz/ICorfPfz6FjsFYxYu4lAQ668VrCkW\nL2ydgvdyRPhxgjUT7n7KxC514zmTVXuYync5Bs+zSrklKmqKo1Mem0Ngbnes\nZTMTQNRpdwBrCxMG32jnLNEFyWRfZ/jxiGSge+qVj+iHfxSZMzMjWLYldE4t\nS2ezKUOiwDUlAGfokAgAl+c3G9o7i++8BHPOHg3WJsWFiAArA2Gh4w6KlT0Q\nK5RxokDz2m6lqdAgOdJ+gBC77bB3FRyF85mJ+68Gfj5Vuo1DmXohY1Y0bAwy\nZXk7iG1D9vPi/uTnQ0d5VOuKH/ZpMIVO+32QBV1PXAeBdw68bDa5HgKBq0rW\n0w19c6NapEcQ8PCgxLNoT27rPSGisSuOXYNRB8wGymDoR9b8EwUiDxyogpPj\nfLchMvZsgP7/JNwLECbIRghYb25WRbYtpSVQl0dQrfnpyfkQnEqbRftrai9B\nau0XzaZ86MmF0FvXtouiy5d38ZjQ+Sy67umVVcFKTeYKqCI3kFvibdNQm4v6\npjD21XTHxbP6fN071f81MJJTv3puQURfZ/gX25o3orWD9XF8fZas04ddluvy\np85G\r\n=Y8Hb\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/mergeConflictMain","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","browser":"./dist/browser/mergeConflictMain","engines":{"vscode":"^1.5.0"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","_hasShrinkwrap":false,"readmeFilename":"README.md","activationEvents":["onStartupFinished"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.dc58838950_1611019928804_0.8178137393118832","host":"s3://npm-registry-packages"}},"0.3.0-next.f37dd66323":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.f37dd66323","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.f37dd66323","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"96f305a647e828027112f30878ffda8079708cb5","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.f37dd66323.tgz","fileCount":12,"integrity":"sha512-R8+UWaB1WtfOs9UY2LzKj++3nk6MVvgw/0DmynBD4Ry4YxDM00UN+BB5/WN6z70Jh7eo17KTVdw/q3+xOlOoUg==","signatures":[{"sig":"MEUCIQCw5Mq01hHOL6LvHvxnf37iG05aXgqQSsHF5F49/abfgwIgQcg3c6GMFJ05OMEv4Xa786vMrntErMSOVJbQm9sZMtQ=","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":106262,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.13\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJgB4jYCRA9TVsSAnZWagAAw+MP/2BpwiPtMzUuGCFWzDKt\nUzlWkGOjQ/Q4jfWXgEQME6Kika6dGrPCtL+zcjhrOcYulPGw3TAWtRgXCq42\ni62M49QHLMSkJD3OMOQSKp+o+lOZyINRB8UdsInIY4Brmu3+DzkzTBcw0G65\nF8LbW40i9MEUMFJcddDS0bCVETEYVTIZ4QM72LXJ0hQr6m76OJcezXglRjow\nCi0tEqlkrylm92me9MWvzDNnEc1fWkWXAt8ZCUXeG9oFx9mikaWEunleXeb2\nhC2O9f9xQMJeCeAvb4rJq9vY0UyzdYvuljg1rVxv5SYo4WazPEV7jxs4Xpv+\nTwhQqxHV+m4RkYM9BsaL6gopg31z1CKU6SRB18KpjYUDWlw7FKIOtOWGc3v6\nl43qy04EHSXAp661pVF2gg/c9Wnp6DesT03+4XvrZafFcTsFmUUzRe+KbV+H\nwVyHbGQrZP0cAzdQvLw+K3xeeVTQzeDTFSBd3Gn8Q5gnXKQi55TZvSCzYshw\nRyUnwlNV7v7M6r+3mTZePWQKrQna/l3m24fOnDYtv8ckCWE7pp5xXw602DGX\nqVDsimdqqjOulvHs8kbF0JlS9/HtK54bFdkbmZtbYWT55gPG1gdJDg407tsx\ntV+fBqzUbx5zutf2YKA17kQHyoCZSX0DPPmq7SCLADZgdhwif3QvTlelFsVO\njDbw\r\n=TT+m\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/mergeConflictMain","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","browser":"./dist/browser/mergeConflictMain","engines":{"vscode":"^1.5.0"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","_hasShrinkwrap":false,"readmeFilename":"README.md","activationEvents":["onStartupFinished"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.f37dd66323_1611106519601_0.5213486365115245","host":"s3://npm-registry-packages"}},"0.3.0-next.9a55eff36f":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.9a55eff36f","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.9a55eff36f","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"4cbb0e0dba4481280febf1172f6bc4b6397dbc53","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.9a55eff36f.tgz","fileCount":12,"integrity":"sha512-EbncgXDpG2Fh7gGQrtn13pWoT3GyROaUqvo97mIGloci7HTVR8bcBh5Ge1L7C2UBNb0Zeq/88iiGx1yKlr12og==","signatures":[{"sig":"MEUCIQDHCZP7qa7I6HcD2kbXqzSJfJTZE+//JCb46L2g9C5cvAIgGKpvqLB1FWj9acXBtvaC8u2lt8dWvwFcpaqu1X8KzEE=","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":106262,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.13\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJgCNnOCRA9TVsSAnZWagAA9VUQAJ+AqP6xB98yIvA90z90\nMAJ74JcNALwIk+fPenzqhjYJTqwDN5xtIJgn+LoGSDqOqNVTrGvMS1320JNn\nqgu9MGSfGdOtBd7szi43CPxmAi3V7b4tPIf0kJg5Obo4QlqAmdXiATg/RN5L\nv0E2z6uYiu0dHz2rlm+N9VvDMw05PN3yKYrthDmrFKhLqED7S0GzCBg0q+A/\n8fmgIpaPG+iFF8NdyMN7Yh9dRYhXgs8REsaP7hrxxZxCRvpNwMf0Xuby3nhJ\nwJGM9sdPVZzxOZL9Cv9QyzmhE7IYmWDJT0hAq6RhdsGS/qdeeQ9byfKG/zxd\nAMH3e9oNMl92eqSHvqItcNHhUwK1yBAaD4NC//sBj2wCtncdaJu6XvV64NEM\nEbel5jCEUqat9vaYm3Zy9zIRcltVjzYZUcbzTrATzMSqa7YYM2bs4se6i3Q2\n3ZAJHy13YWB8c0pUljFXJFs4dFtioaJY8wsE4FH8f3hPGnZ2v+rJHBzqaZCy\nykHAV140iKEt/b84cDKTuWfG3gdNPDLHSl8pypE0d6sVpk1oG4P/W358l64X\nELO6VrovBhQTokOxlWIFAR7xeucDDmNxoj8T/AsRRADCpeOLmXORzXhIetTE\nPToxEXA64P21t2dB+9orQ5lPzrDCZEgz2fA2hkBVkbwuWJXZu7WTOiPybvBs\n7gZf\r\n=nudl\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/mergeConflictMain","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","browser":"./dist/browser/mergeConflictMain","engines":{"vscode":"^1.5.0"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","_hasShrinkwrap":false,"readmeFilename":"README.md","activationEvents":["onStartupFinished"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.9a55eff36f_1611192782477_0.6517272234812066","host":"s3://npm-registry-packages"}},"0.3.0-next.f0bd7eee10":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.f0bd7eee10","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.f0bd7eee10","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"d206e9d07bea57838787c0a9a7bf8209123cdeb3","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.f0bd7eee10.tgz","fileCount":12,"integrity":"sha512-rP+LwHpUDHuJLPnfbfDnLAL21xSJ/kdnbDaRzpqMXHKaIDZHydqwJ+vc/nNAxnj/iuVezyc2cNMRz/ELdRTIaQ==","signatures":[{"sig":"MEUCIQC2CqfGtRuB1Jlp23uZSE483qGj6VNx/XADW5QvI8Vl8AIgamk11GydS/9gEG0uhEQ6TwnCp/y/W7Pu9YVXsIoPXv4=","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":106262,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.13\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJgC3zHCRA9TVsSAnZWagAAEbMP/1tuwSUsNo5zHjpb77/9\n48Pr6rqNOumbxZFrPpB4kM5LDzqw0xm+TeNDIJnNHl+cvaqvnvbHKj3aivDX\nShLqT2/rZLPUD3BxbyDnuojoYv9V9FsI56T+ADAh50JeIneLEvDbjoKrH6EF\nE4vlf2HCNNo8KvxKXA/2rLScYmf8HsgJb7oQZ/qwwtFmWTO1nNktVjdCp56q\nzpPlDmwcreZfBDHL77hu0j/9JWQvBUcmdWDgcHxit10Tn+Bn4QyOvnczTY9O\n7ip7r5LmCLqQeRp1ebTIMxNjgYzyFjbd67xfgewIpkw7wMU9tREKFmu6Z+fV\nzsGbC7NRB2DRlmUYItgTkXhF0wlpD/ncclY3Xya3Ng3kgNho+P3jZ/eWBq/W\nneIErGSTBkQPP+zZe2GzFN3E57iX4CW2t1lm97yPF4Nq6xKFLisssN3gqlzv\nQCtzwGl+MISivlE0uv+FUqjWUg//7bx1omUfXY8PLZfr6ikmJBHCY3rV1GGt\nzA2Kw/nMQkQiJqZLUh2ZH748qI7TtNJ4OptjxoTLZGARrGvYGTMPgyqzq8WZ\nlAJFd7FWD84TN8tJT0gqRki2P4Hhz8E8wV/i4T8oTDypgQQQOLZAB3dviNgC\ngl6/l8Ad4tf+Onu/YXy/JzqI+qd8dQuMMJFEFCb02CKpZBZ3FI/MgXA+5sMN\nLW4H\r\n=axDF\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/mergeConflictMain","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","browser":"./dist/browser/mergeConflictMain","engines":{"vscode":"^1.5.0"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","_hasShrinkwrap":false,"readmeFilename":"README.md","activationEvents":["onStartupFinished"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.f0bd7eee10_1611365574825_0.5412466904071205","host":"s3://npm-registry-packages"}},"0.3.0-next.79be0a0724":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.79be0a0724","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.79be0a0724","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"223525ae55efd4cdc61d56c316055886f5be0dab","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.79be0a0724.tgz","fileCount":12,"integrity":"sha512-w+ZXNuc+IV1nTsyWazCkPjibCjxilMwtggE7SPk2h/l2SqpYRyfUHZ9qwfB3FqpwQqPXdANonVJe3v34Kkr0iA==","signatures":[{"sig":"MEUCIC64GVxjGstJMDVZ8Uvr+0xKTVgk31WyHnLKM1EIz51TAiEA6X6uSpaZa+wrj5gAsLea6gxmD9aD1Blypg5rWVnQLgA=","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":106262,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.13\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJgDM5DCRA9TVsSAnZWagAACmwP+wQzllv6TOtn+zjEYHQK\nbWxK88kBSW15chk1XxDcAnnvpjXZiB29SuW+1Sh/tJjWsKKuqCvCtpX7sYDl\n2kVjLncvAu9Xp1Cm3jK6XRb41E9B0NojjZNH7iLk0xDopRKvDK+3nq1yJczI\n13sr2GfRNjGbzHTjuj2joxzJU7MrEtDrGeoDAsgNsofRZThKL6toqB8Luxp/\nD5Hge+1xAqnmFV8OQxEM+LO3Dhz9WiEqD/t0iZlAuJjkf+UEMYbjztefdFWj\nzgJ8ndc7no3n67yB/nzUIv1IgsYbJVz5VJk4NyKOxS0vtFNgp3nsRxyIEJU6\nSZooJw0BzAz9IgU8Kdj3ThI9aZ3PWq2+AQY+9Kw94Hm4BGJrTFWt8ZWNJE8q\njN7zsBhiNnJmUmySK/0jirCiQyMEzYPpg3ol1y8qjRV86UZTmV92pzaXn4Rl\n99+yCJOkzb00ep4t4iqt7i+lRwG6ANcdnIVJYg2WxPkGRnKEPTWFBUHp86Vs\nmtKbM2qQEUDHucIOwsdIYgAi02j528PiXzldRgpM913IzlNAHcLXIhyuwMl7\nN85+S356xW0Ek3NtW549K4B3ne1OTDiSyAqbnvB2Mdaq4sbstQNzswmEd4Sg\nI2irZ0eoPyLZ3vW3nAWzghJgQlpJHAIYV0wk7oVX43swTGtmzHt3iuqELYmM\nApGT\r\n=cj6o\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/mergeConflictMain","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","browser":"./dist/browser/mergeConflictMain","engines":{"vscode":"^1.5.0"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","_hasShrinkwrap":false,"readmeFilename":"README.md","activationEvents":["onStartupFinished"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.79be0a0724_1611451970781_0.31097531310331705","host":"s3://npm-registry-packages"}},"0.3.0-next.d2cbc66835":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.d2cbc66835","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.d2cbc66835","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"70dc10440eda492eeeefd754cc35aaeaa826f48d","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.d2cbc66835.tgz","fileCount":12,"integrity":"sha512-kV5r3hOTGbVEe/Nl+vtWv8HaiGCsi/NyuXFiH5I719821w99Y8tppp8SJ/OpVm4qE6smyXt/KyjCXL3Mf1d5HA==","signatures":[{"sig":"MEUCIEPFTGoQMcLqTaQ6xxcpv06I2unYNLqG0iEEClt2aJRiAiEAlEjJ3TKG+yDlWTRbW7CJMZVrWNm6hS2amMJJJfsxxvQ=","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":106262,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.13\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJgDh+sCRA9TVsSAnZWagAAJFMP+wemX2KEyVTvjYIRL9kQ\nItg+8ZQRTOIfzYtll9lIRb19wDIIHeVt27BsTWwl/FER9FBw7xBpRfOZdE1i\nh63e4w7R79B7k5uZ5oFFzPDDNeIl+jQINgrOvPW5v50CHm87ZpAGBeVe58mh\nZNHVMpNvn+73l4YgzEgZZ2PxnikVykj65k+G8jR/YE/xn8VtplKCFUumKltl\n9BNbB6zO5axNCS4TQ+85oU+GKbyDNpV+N2AGq76aVSkKiy1l4s3TT4yf7s2M\nHGu5uAvCd0MM75dfzkzJIxn8CrnJzahXvp2baKMd84CT8SrNvl2rHSw/7Yf2\nrlvoWtP7xa5SEtcks5YeP41UJ9Y0zYkfaQCS8CAUhbbNB/TAdMSkb+bqwBub\ntBTFMny18xjUH8ov21HPxYqeCahz3+XD27YulN83u5QuOba3aYjY277tmzNg\nrVLhA9YO6rYMfEWg3DR2w85z7YeOUQLG7PjuToWXYWhnIeVQskWmqeEE8hpX\n4ivHMF5whf1LUTucyA40nzAPUuySpXDP/Z0zGQ0pNSzyFZ5oQmIxPOeaHJID\nPEojlnZNMrH79whNGElv3HhC6Z1694hCA8VQ0mi38sIULWacTmWMrZEmrCNc\nOam4E5D3/hVb7mN71+CNZIpTKpkCtyxyvCUfvmOC3BSbzyUW/KxBX+4xL/w6\nTtKA\r\n=UMLE\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/mergeConflictMain","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","browser":"./dist/browser/mergeConflictMain","engines":{"vscode":"^1.5.0"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","_hasShrinkwrap":false,"readmeFilename":"README.md","activationEvents":["onStartupFinished"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.d2cbc66835_1611538347993_0.9573951010333299","host":"s3://npm-registry-packages"}},"0.3.0-next.8fa1417e30":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.8fa1417e30","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.8fa1417e30","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"20164396d41ad8fe5c2ba3a61c160fe78c14c49d","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.8fa1417e30.tgz","fileCount":12,"integrity":"sha512-D99FPki1iLxk5rjLK8TFaMLyYjMGpsVxnvTYAjB/LSCXkkZV9nv+RVJwTpN196wN810TfgBKiXf8EHftQzDpjg==","signatures":[{"sig":"MEYCIQCxASbNJWZCCIGfs2hpiSkpQmLakQiEbrDujKn6Axd9EwIhALYQR6phA7hJ3vLKGKdI4Bov8suTECpJaIj1UMCq6QyP","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":106262,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.13\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJgD2nmCRA9TVsSAnZWagAA4OUQAJDpAP+E+0wdTsOH8U9L\npdgnEqRaXqiAFz5wa+/2nRsbt1Jybz+5qcOviPBo9tnanOg7fmqL4nOTXygU\neIuBNs81QBtOp6ePp7D824Ke6mqyKOcUAlvQwGfV8B8ICKECYp/2jq0+GFjm\ndDKxDt8KvZYuRetny2d4Y2BKoiX0wiJFB61TfI/vMTAXkXs4tcyYIiAmP8Kh\ntDXGZgSxA6oWpjoF53ScbZo596KuyyM8Ki1ahmal5yeSO22z/vrZZeSu9hP0\n54JSbeztX1gNg3ECWVb3/x+MLSXUhTpTbgYiLLhNJLxsV6UfA4yvkldeMcjL\nKfmyOk+0+ZgTKFowyFFS//HsiLxd06jWZkmG4AeLzqQnKdeBGw+T5enkrf/P\nIUE/vicv07vfsbRIpzZQHNsi00gNLZdxuD+60USRTEaU4Tne6d+cbpbUz13F\nwvlOFKCSS/wqvvrpC//ArG3L5do8HyuQs/uy7n2+zRlNoWNCMgWl4W6etiA+\nBBUi+W6zqiaGQo5szD4Awd+O2vL6pix8fCjuxpgAvHRhfkTiA8Y4IWGE5A6K\nccVEeFrXWqbZ+/ZVu60tnVP2VzRkgWKN/gzgjYCOmlhoS3dwvnt9x4cw7x+C\n3QtoM64Zb47h7quudLwVeSqONt8ayTKrJOcSsOD18PF+hheL2j9sUg/24R+H\nGdKH\r\n=9F1n\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/mergeConflictMain","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","browser":"./dist/browser/mergeConflictMain","engines":{"vscode":"^1.5.0"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","_hasShrinkwrap":false,"readmeFilename":"README.md","activationEvents":["onStartupFinished"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.8fa1417e30_1611622885839_0.13496923930644367","host":"s3://npm-registry-packages"}},"0.3.0-next.a56bc0c671":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.a56bc0c671","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.a56bc0c671","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"0ab39d3ea7f71edd03a797b3712d8714ed398a04","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.a56bc0c671.tgz","fileCount":12,"integrity":"sha512-+dywC+Hfh5R7kM0qTeQG34ukkGMEnwHTqJflA/7TbPN+DcLQTiKgQSYb9SwO13s6FDqWlxEtStI/AGI3UW7jrg==","signatures":[{"sig":"MEQCIFKh8QQj1J1ASJ2U0n91F+hz7S42a6CmCg2f+oDWOQzAAiB5p5mtbtqsg79lU5OkqMjhhKv13+esFa9EgwkNBHMDCA==","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":106262,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.13\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJgELskCRA9TVsSAnZWagAASz0P/i0M9SVj6fOwTyp1lnXw\nD2wqt8XZi2d5jR6++lhH5gz6an6S2As7c8/eXoqfgvnLkh3581i73vrTgMQ9\nG/mQwSsbkae/9dZoO4iMMHREMRTuKZYG8ln9teiQUzH1UX0WDWAF6WdZZRN+\n4gTvWgmvgAU+hbETnTV/ZCv62cidZfGqumSiiTeYjlUeHi9jqH783afNGMMi\nraxWNHrqzgqvTRGh6SHlKHm6hU+fMLfZktXz8WzKP4CXJB1UaC2xV+KOLK7D\n62nyA5MzEjXPRXHpAQzUWs2UyC8BWyEQtr/ihTJ9TJOVhTQ1mN2qnScurgMF\neWC/2OhOCK7DHbURuu0o49akq8kYuHuCzUBWYTTPJwROYaQD4RSDr5sgSYHB\nsuZDklicSsFlA2YdiqJPvaHckUHKTTEkT1DFLmzhwv22yTBok6wdJI8BUA3C\n5lOaqfng7UC+6mqsVPLG4BLPVp9iO5l8rNnWRaeXG+MkpBW+zfrRmr7RRjuQ\ntWzcNU0tNqldhDGcwv6D90eqmRzuS7f+uPJG1le1YJZ3ui+kLMS3xrpMFTmF\nOaxX6xDe4E+TeyJU1ssoPo8cjHl1g1H1ZHLrDgszwCbMOJRY9JyyZcIMHyev\n1HT1atI1/tEp/enXxAe5Vf5p8QkofFdf6XcNYEBWsYXPiTQbkTWviBOKe1qu\nW11V\r\n=nrRu\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/mergeConflictMain","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","browser":"./dist/browser/mergeConflictMain","engines":{"vscode":"^1.5.0"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","_hasShrinkwrap":false,"readmeFilename":"README.md","activationEvents":["onStartupFinished"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.a56bc0c671_1611709220067_0.13511573618656314","host":"s3://npm-registry-packages"}},"0.3.0-next.e48b3d3cad":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.e48b3d3cad","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.e48b3d3cad","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"cfa1ec938962874491370baa82a204792937f935","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.e48b3d3cad.tgz","fileCount":12,"integrity":"sha512-RvUqTL4beLxl3+i8cC+bEvmEIVBg6K8JKfBPyIUwB/qFAgpoiRCB/I2unWe2lK0+ODiPIZrIhtOAJfouEYzB2g==","signatures":[{"sig":"MEYCIQDRbz3g20P7qh4Akc/mJ6kAVFrj12h7ip5l951cYhPVoQIhANpJjchtGk2IuiIjMwfwjGG38tjk6z1iprOXPKkVTPxD","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":106262,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.13\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJgEg0ICRA9TVsSAnZWagAAhC4QAJxvZaLmwLbj2U9Q7CBr\nh89e1RxHXtPE5J+i97+wuT1jrqTVCaEFmB++W3xGtDEWZ7ebOYhIY/k0k6Py\nJ5JjRubgLnlM2fwk9surkXra7LNniAGC4ru6emsa7DRBTzvQLrE3SkCVy9OH\nhXMtwkRXONEwow1LTnLUnIFC8EA8CRsqka/GUvyStw8d75k6KoOuQHmKxAOd\nNGsq/WXsLRh8rHjTQsm3HivkcfvTSsuQqYi87rMJa9Cyn6Vz5TJlwNjLvFmU\n7nQCg+90OYmef4QRKmqTDkslI3pekD3U0znWwBntoRcwNXyipOAH9+j3BZvx\nwUnlcRAVz2/ph15Avi8LmyPsBkl7hGfFU17K5iWYG+83omFMl2vIfMoB54tp\nveQi9R8YSTdns677+HFdWAs16dD3X7dgegQoJmtfANOg3SaUU55xZQ0Jepsp\nW+a90yRsG2tW89U4VVBzCNDfjCYic5mJionwz/mMXZNgLGIMmm/cWfdZbCX7\nyykcjU5/3CnDvt9rm69hiRRasthvRUCIVdHnmm7nTEC0/LUU4jE5iMdBtAdN\nkp5k61rIN9TbCqfXHcPJoK2Mevq++Dv677/y9key3akmMZg6d46lblAY1fnH\nBTZzKIc5Tg3ztvDpEJALmHqSDtzfqcitvdk3cHGNQOhvgZvcIE0cw2Uw1/Dt\n1kEo\r\n=qXyT\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/mergeConflictMain","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","browser":"./dist/browser/mergeConflictMain","engines":{"vscode":"^1.5.0"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","_hasShrinkwrap":false,"readmeFilename":"README.md","activationEvents":["onStartupFinished"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.e48b3d3cad_1611795719843_0.7367450198600254","host":"s3://npm-registry-packages"}},"0.3.0-next.d27b3130d9":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.d27b3130d9","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.d27b3130d9","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"841ec602308cd3cb03167f3cd7ce4ee9b13b1675","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.d27b3130d9.tgz","fileCount":12,"integrity":"sha512-WBK0e3iL8bAIlsu7kkeUm39jh4XxMN/06CcnIqPMX2dw0BvrB+RaR0OCKzt6l90cOADN85G6Z1mhzKuGejy8Cg==","signatures":[{"sig":"MEQCIEDswX9VS+DYfNx4IC5iOEytIEwsYaKcnk9W39IRADMcAiAUS/G29cgYbB9cdVD6jrd4tD3ulVEpgjmvcYvYLN1QbQ==","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":106262,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.13\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJgE141CRA9TVsSAnZWagAAlxIP+wfSaqakeV01p+qPLMKB\nd8KV+9lXRcMe1TdszqzsKhPeBnIlGIxqO30FYXUaSbT2ekmU7e6e2L2RBMIA\nAhUxBmb93az5W4u2WRqOoqAjzPUafWGLSxP9SyY+PrdP1N7FWrAOzaQTwj2K\nktfukM7nDZTuh1OVuoGVcGYAkkhM501SNRu6qL0UZjnTeIlzPlL+fxFdUDaG\nilZY8VH0OHvPSArELlbjwQWFEPOrHKyLpA6kkgHPnd1myY0WOKHLzAroo1pj\nVopgVGm+zTCQ9g75dyfyDwasQR/43bj6sATuRz5fAbTA+qo/gA4oQVPYau7C\nq7fU7OQMY3NRoZngOAYP9XXHoH0UE0nD3854eDkJ52BWgSbLDTBiKzf8X/kR\nY4S9sgS7UelrKRAzNZnVt5d5V8kyjCTCvK/KQ9nF44vjr2+sZj58HSM/6DYN\nbVQRHQxyU9rwbKpSM0tT9u/z0dFfTKMlul7lCa0GnE0Dqo/5DtJC1U5+TMCb\nSdEIyZ0076x+HxfuOZU1PQ3KT7eC8y7IJ8dSYCPsY0/6cT7sgO8J4qSc6GSY\nGumSPYJR5GLEJO1ho0MwJ38jMyTSJBcKl3q8cNq5OsUhbqk3kaVg/2Hnc3FB\nsUEMHOgM49+qVG6tmivO0x7gj2wZSP/ObFnZRLZSNEQNaxxFSb0HaieEqGhR\n0Xj3\r\n=lh9B\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/mergeConflictMain","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","browser":"./dist/browser/mergeConflictMain","engines":{"vscode":"^1.5.0"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","_hasShrinkwrap":false,"readmeFilename":"README.md","activationEvents":["onStartupFinished"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.d27b3130d9_1611882037411_0.23726628305990438","host":"s3://npm-registry-packages"}},"0.3.0-next.81ae94a9dc":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.81ae94a9dc","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.81ae94a9dc","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"cc26d8b7717dc8ca45b2dcdb06dba277cd67dddc","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.81ae94a9dc.tgz","fileCount":12,"integrity":"sha512-a9IE3Dtv4px+J4Bj0C878g/kR5chpgT43TVBSaxL/tEZhHNs5eNJiXf7oo5xbLWgHQ2IbMuQPBNdrXpxzqy2GQ==","signatures":[{"sig":"MEQCIEuMRZCarYTLnfgMLA8r4sSuW+WnUHwg79ZpHf2GrnD+AiBi5gCeWFWqqVb6EbLDo9irWnIlxA9AvD3u1xcCt7N79w==","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":106262,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.13\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJgFK9VCRA9TVsSAnZWagAANNUP/2TM8OOeWNlJXlkecRTC\nO3JskgyYO+0wgSuMu/dBOtxpV2vHtx0eKpO4FU4g0UrB516WMoodp6X0RX+U\n2NALUU+uDfC+YFtd8j1GbpGSJ7hQcoNkCT9NUgaqq3+moEwLOCH8OFKpOdTy\nEx8QPP4FUruoIcf1uK06Ok9CJsPUZdEitFPTiJfjnYRpYP3EcbOdli0IZLTW\nQk9seYbEHpnRMYmVNrfyOfDvPKy6iWX8qzvGeOIVYK07jfksPL2qSL+nTE41\nZuj1o61b/F3jJ+5yyapkim04RG37o9dxL5/CgtSSWGipHXvLdJ418YTycEgX\nwXYiW2fF/g3VeXuhnX/2ziPE1yDNGAjRJX82jWleoPiV3MckCJdNuQLd8gbd\n+UPJ8uyElXXpOcc7RNpDKf6sxEBQx6atbYRczpbtCIu+/zDrbb8oXMnYOZn1\n20d292NAwgI2L95+rgaFf+y57DIfDFK7cmO5GrJlqKUavotlTLgPbfUEo+cE\ncs0IFKDUF6Lgq5LQtCZUGr5e7oQmGoUUneaOg89yTEHT2ozU8jrGBZA2YC/i\n4a3kEfm1DXkdKqIrrPA0NmgTXCThVCYwgpZoJlTKoMXZPFHNsrJpVPcBnTmS\nvRT0gYsPqLRWQ9pt8rh1sfo54dVSC2b0eminMjMTxmcRE3FZqo4NQNLRkbhZ\nNbC7\r\n=BD4C\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/mergeConflictMain","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","browser":"./dist/browser/mergeConflictMain","engines":{"vscode":"^1.5.0"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","_hasShrinkwrap":false,"readmeFilename":"README.md","activationEvents":["onStartupFinished"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.81ae94a9dc_1611968340920_0.6200798104698706","host":"s3://npm-registry-packages"}},"0.3.0-next.02d28757e8":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.02d28757e8","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.02d28757e8","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"ba1842d4e78424672d307a7f632be226d8ebb754","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.02d28757e8.tgz","fileCount":12,"integrity":"sha512-8eS6GapGio0n2EsxK3+6vNUKD8fmHEwccXI8P0rB1e9hpl6ezJv7VEUpwbtsj1nbqBa+Jw1fnJBZuIcHtWSc+Q==","signatures":[{"sig":"MEQCIEyjwltqMjSjVciojVzRXHjWS8Nw5NbULVGHhqVLICSnAiBnol/5J4Lm1EVmg/NwAv+C70Bab5+rdtNJpxsJsvZlNg==","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":106262,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.13\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJgGDBACRA9TVsSAnZWagAAMjoQAIMsC56CyFS5OkJd6w4Z\nJ+K2SkOX23D1Feuh0G/6SyRWoNjEzD1Pfo7Ar3LCJsBZpD5LzjdQ9YYplfxW\n1HOuY8jMvbmElpTTz2AFZ9M9CWvVexMCDI1yov75mbuJXetLRfdIT1QFX4ZQ\nUPNU1YvW1Au18/ySapZJEjc5hFzkamrRJtDD5RJ6tOabrLmR7JMlIXSiJJO/\nqL6vWVqAMehzIFYBBcuPAY1rnBwziANn7LeQuySbbWxFLF+RFQOq0ouNb8h/\n6d+onY7+N1AQFqq2Pi0iyEo0llgzSZz2b/LS6wEzCvDP3nhSUIdt18uYvA3i\nsga4FkdRgUGV1/095JeYHIAUsxSLW+KMgvtmpKeAR6Pq0CViP4yS4vBJsjeM\nIE4+j7/kfHiJUCUux9+yBlJdMd/SIoNhm5IfnG9HGdPkKgxY3qvvZvm2Nkls\npNiHT/6oCUVWxUnBW4JJzV9RyqJiObnnID9ks5n1tiJXp0DQUC1y1AytpFcp\n7I06gZFmk1nFNnNniXe+Ql02v70wLGDCEUHuYzBvy9IEgF54Klsn0s5qVKu4\nSsCOYxAp//dIIIgNZWp7fgPKCFMB+7YYgQ7HZA8ILojgiECf2lCkYrN9YZla\no2WichbIEnnQzRyFAGTjthoi08/6glOAym+6hPoBKbL56aJ4gWRxZJHHIntv\nBB0U\r\n=IX+R\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/mergeConflictMain","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","browser":"./dist/browser/mergeConflictMain","engines":{"vscode":"^1.5.0"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","_hasShrinkwrap":false,"readmeFilename":"README.md","activationEvents":["onStartupFinished"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.02d28757e8_1612197952408_0.808286411500678","host":"s3://npm-registry-packages"}},"0.3.0-next.6fed1b6383":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.6fed1b6383","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.6fed1b6383","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"cf43c8803c787245538bb616698649231925660e","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.6fed1b6383.tgz","fileCount":12,"integrity":"sha512-lckd+NJGXT1P8sKkxCyKSpiZ2wq2NIFngE6ufKynefsfRbp3oyPRb2cImziTkrVvQjmmHB2y69vjGJcixay5lg==","signatures":[{"sig":"MEQCICC08uxnKGcuYaTaDI0A2OoXy7UgvUwXQlmuSsG/6uyYAiA+I6bLk/bRHdw63Udp6NRKiQmPqq4fNdypW0TbRcmemg==","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":106262,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.13\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJgGKL9CRA9TVsSAnZWagAA2kgP/AwXyKGvE7Urd7eRXngy\nYQ4M5BaQEPbh0FH0x6/f7C3kwg1wZ66MESKp6Z0nhozBeHo21QzAs0jOGKBu\nL5HBiLs+u1g5DEieC/yu7rU/mYnp8z/GjVKEFwKdNm1gWvKNBm7nxMRdtfBo\nQ0AnQjUmb2rFX9XNwkqUSDPRH4s44a0xcx05cspIlO1VpHby8Of2+eQTxljx\nSMCbIV8Pt5KBxHOmj/mem0oT00euqo+PLo5xeFN6lzXFlis4yj9PqqPV49dw\nIwdUU+uSbT8HVmjLBuJFbTn4H9Xdp5q0xbGzOs4RJ+Sgqt1lhLNExE26OCu0\nMigpgOBmgdECr8OkRSzZ3zZlX/qv0G8kdR5fZxkrZcBeHHuvxIxDKl3KZ8A6\nNaMO4ThTXweNor51HeeHmQEo35hAetyUNVDZdWedNcHmeYB9t3HdxZ7NMSli\n+t3LmIKDtgV8Udk87UPuxrywDW//mXJMJVLKzoO9xJ+NMtGoHBIfxGm2XKQ7\ntYO9bmmvNm3BwyICUIJMdeDWEq1OLjP0pZQl9s1IRijv4yvTXIpIpgKKPpI0\nCtgIRe5fuoIcLCzlhMJWQJ095Iu/iNhGxIQEOXCo9DnI7rmMvLAyYe8RF7i0\nfaDykb9Y+HeFqKttjsm8gO17mURXocvJqgBTjVEs95Sq6nHQVh94cy2rS68b\nCD2c\r\n=Yrmz\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/mergeConflictMain","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","browser":"./dist/browser/mergeConflictMain","engines":{"vscode":"^1.5.0"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","_hasShrinkwrap":false,"readmeFilename":"README.md","activationEvents":["onStartupFinished"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.6fed1b6383_1612227324712_0.166834656683561","host":"s3://npm-registry-packages"}},"0.3.0-next.3088c27fbd":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.3088c27fbd","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.3088c27fbd","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"c45671ab19751ba6e04ccc3b387652ebb449a01b","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.3088c27fbd.tgz","fileCount":12,"integrity":"sha512-e0zkD9BmQhN21XntPBp5YcZahBsUXWwoE53J1HG0CJ7R3LdnfeRVD/xLa3cawQKdUY4iN7RCp9oppywnE1hCMg==","signatures":[{"sig":"MEUCIEpFuYVsA8/91x3ununUYWruBor+5q0V7hgZH3RjpM+zAiEA9FArqhI0ADgaR61a3i4elkJzjodemjRsmUZidFibZXg=","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":106357,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.13\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJgGY/BCRA9TVsSAnZWagAAfKMP/ArZt6RD3dFx1pkcu1ye\n5NBm+jirhMwgh8yygdv8Nigm2yQ6EAiLwX8cSjjTHgTEt7oaXNImYBJ4+/8/\nsW1tN7B6vbXEOeM8TlUCWQluVZ4lRu2cETtscwv67WVimysYAZUgVWemOieQ\nDaqrQ7iJhBeQXV6hA/wD1NLYKZ1QSrDM7rqunVwZGd/1La0N6TPoQYlrqD5w\n9jkjmKgvkBLsTpppNMr/dLWuV00dzCMhaqc63sGQQwhr0ZzQQAC7WQMWexmv\nj1tmk8A9EFdexumSR5tYXV+K71UZ/jTXvpBpfqlz5k/7sgIuvpqleK3EXsmP\nxZRuZKzpttwOEu1TR/LCrpl1F3mmUKijfbNuIcHAvLoUcKxbVedUdfqSW3vp\n6Ynsy6mVOpjBRk+8bwEuuyMXHl4h4/Lvsmb7XgXYq3A7g57Fq2TA8Iut0rcF\nigVLzpzhgQxlzwqbyEKEmr1+0GZc4CDjDSHlmAzN8hxjT9ZMBObHTvDbDDVR\nYIZyxOdy9iQbtozCtiuW0+C/GaZmPX1WLVcrCn3KtbhsGOWiji26F/bcPZ6b\nbqRosDPgEveQbQGSWsU5BCOsJhJ8IOejneux3yDE6Di7ts3dEafRmPzbisTg\nezxj/abtRjb1bEpi4M46P3NO4h4MtVpr2VqmvgyB84wWwmjv2hCCV2uC0Xub\nkpia\r\n=tai/\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/mergeConflictMain","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","browser":"./dist/browser/mergeConflictMain","engines":{"vscode":"^1.5.0"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","repository":{"url":"https://github.com/microsoft/vscode.git","type":"git"},"contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","_hasShrinkwrap":false,"readmeFilename":"README.md","activationEvents":["onStartupFinished"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.3088c27fbd_1612287937442_0.2873614586081139","host":"s3://npm-registry-packages"}},"0.3.0-next.316a1d86e0":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.316a1d86e0","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.316a1d86e0","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"53121f67981f49f4f9b5611487a7ca070f702396","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.316a1d86e0.tgz","fileCount":12,"integrity":"sha512-geDEzlz3s237uDgdZ+q3kD8voZt1JZklYbpOLBl4a2SA7nkVupasNfVm9CuamuMpZCkvMIyjxWQBqJya3nod1A==","signatures":[{"sig":"MEUCIQCANprLW7znhKf4nXPk75970b6JZ79D3z1TGaqB5S/qCQIgZhOVGrycFFnh+qqv35Is/z+m97b29ntMrnRNK/rrid0=","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":106357,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.13\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJgGfS+CRA9TVsSAnZWagAA/C8QAKMTk3NsKbGqYfZJOwG3\na4hQfbxiQWYETSjZF1TdQO7uZLf2MyXiIEqAzHRODdaSDB08M+NMYoZMHI8T\nk9+c9Hb5ZOIbHUiLkx52A0Fl1s+KD4qxU+3cMhh0nqPXMF61jqjaUqxjKxCy\nEo17vNMFz/x7fsbfe7WQUHi4eq/ivOFGG5ZrWyfIrYFme4hJdf68J8z6UG3P\nvOYwwlfVWpRK1G9HeHHT/ofwM1YDibdBHdxows8rEoIBbxTfF9VBP/i/N9fq\nToCoDoa6pv5jhmWfxZ2p3Dx7vJ+jI51XmOxYH1BZpshxF///E7+FGGKZPF0p\nFq1WlgeT+lHcjfv70R2Nl45a2HEFopzfrXqB99txO0ssNF2NxIKar3jT4rrA\nzp0G2tlVlrOsOLp5Cgn0Qh3Mhcc1ezFjEMyqJlzNpELSe++0vUaUWPlsNw/I\nO1uH2BisqTpow3b8a+v9YNBpYCOY5ptV/SqiKwLyGUKDgEhVIfmLGhw7Ao/k\nRZFWkHF5ylOkYhnM4TY4mLM9r1xoulfqnh0GC9z8gfALs4pGIHR64I3n5sYR\nDBEgBAQMNds27PoHoO0tSwJwnpGRHbFpJTP5DDIS5scb5cNw57FlkSIocMnB\nazHkFlK/RYk39rZ/mCKh3Prz5pbi2KPtq3BYJAgaiHEcBs0opHuhGYHDYize\nAcds\r\n=mqAD\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/mergeConflictMain","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","browser":"./dist/browser/mergeConflictMain","engines":{"vscode":"^1.5.0"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","repository":{"url":"https://github.com/microsoft/vscode.git","type":"git"},"contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","_hasShrinkwrap":false,"readmeFilename":"README.md","activationEvents":["onStartupFinished"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.316a1d86e0_1612313790112_0.42170937590377977","host":"s3://npm-registry-packages"}},"0.3.0-next.eac031eedd":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.eac031eedd","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.eac031eedd","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"a14f2a56b9eb94d597604191d19bb304bce8387f","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.eac031eedd.tgz","fileCount":12,"integrity":"sha512-RD19jjsWqOEODVyVyf+9IhvMKvU3owOptMP7T+3jZQdh0b1plS+I3YH4BQwj8AYP+xYyCl00e/pV8S7RdPd2cg==","signatures":[{"sig":"MEUCIQDefPKc60HHEoFAraegEOsH5uOkNLHhr3eMatRWS6hDcQIgRBlk7RhcgGqtydxGXbKAps+gH8M/k32tCcEwanpT8t8=","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":106357,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.13\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJgG0cbCRA9TVsSAnZWagAAZmEQAJ5NoiEB0KIkYX2qpjFH\nTWvW8EqlVVV3N0OPSAdvruDSaVJi+hTEptcBQLD6oPCDNfeK7GrwlLCLQAcR\nDXM8REpELwzJprFBffP7ikRyQ4p+YKGqvWruCSXvvy12BufatZmAxxLd7Q3B\nsaHayejqenVmTlgiXd3/AK/7KXXdomUkb1FhM+ZMlU5WITBquKSyi1wUNX9S\nR9mwJJDe5nwAn8B3rTdUcuCiR/8fbcjhMnbHlIoLqQxN6M+RUPLcop3n080Y\nGVifzoDr6euS8+/l++wWBKD43Kr6tU/AEl9kQLk3Tl7bzAIq57yxt5AVhXCe\nBN9mqJpFMEZt6b3jFDVnnR8bsCLHaNQp2Uj8sHjeS5y8bCAlPK9Rlg9eIj7B\ndczbDPB2kBJPVqDVc4D7iC/ooJSaZJssH130V0s1viZrd9n0w3ptIyHX+Rnj\n2uZZiQqoFHrrl7i5wr+AvZgtTc1b52abkxv5csG58ON19MKQ7LAvQswcfFho\nowYgJTACG0n93LsYZTbxCppNQWQP6gHdoyjKlQVDYZN85mtDwolRhnfmzoRs\nruv2bNHl+bb7jpOX3wVeFd0zyGZTGyE725zIZpGRBkdX3QTj1fPZ67SVkRD1\neTPVxKJD0LFqsvwacnPryQvRaZYHpQvODA11CyI/y2fFlgVMJP30WymJ5Hhh\nz+hc\r\n=Ig4d\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/mergeConflictMain","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","browser":"./dist/browser/mergeConflictMain","engines":{"vscode":"^1.5.0"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","repository":{"url":"https://github.com/microsoft/vscode.git","type":"git"},"contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","_hasShrinkwrap":false,"readmeFilename":"README.md","activationEvents":["onStartupFinished"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.eac031eedd_1612400410899_0.31193751230714284","host":"s3://npm-registry-packages"}},"0.3.0-next.99f71a032e":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.99f71a032e","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.99f71a032e","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"fe9c207b2b2e1eedaa930ed2eed66bff681ec8dd","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.99f71a032e.tgz","fileCount":12,"integrity":"sha512-OIQEvBwO/JH96diKVTS78ZzRH7N74grWp9atTvoBZbj9R0X+H/6L1qRG3YJ9LOtvuCV2bSraBIm3WMP01fp0cA==","signatures":[{"sig":"MEQCIEspOoW6tSGF7Gbl3Pjg1HY5RyWT+NeFpLhd3euBsvu0AiA0ol1CiqRgLTFDCtNo8HtPN1HO+lZm9ylCoPBDMmv36g==","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":106357,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.13\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJgHJbOCRA9TVsSAnZWagAA7B4P/2RbgJbABEXW5fFzOI0g\n6Itnzbxo7lEGnyk9fy2iJ8GCdcL+GUTS4JEAl1ppvOepC0WjaZYk7Bm7TBLg\n8/77rDyrEis8oY0eybQgrdvvx+ayR5vnts0hGVJ/lCyfPObDjzeauvm51AoD\nfPEwrbBJDMlsJij5e+StA35x1lVQttLR2Pu3i2BLihcwVdPoyF/LSD10m6oG\nxrlA8SfJ+53O2ZTA78PCb+CfusmSkJ5fbUlaJAgSkv9A9NfmKHejZCoO7mNO\nENWajnxjHlwQ9ge+BVbfiS/KDxLRHWjey3kg2Cyt3wOGeckRINpC8+FG2DL0\n45gl8FcQnPkPUalAar+txyN5vwvERsS+s9GRg7zc9du7kqA0V+SlYE7es/k2\nZ5RRrR/ve7ZodiO1hcLf/0iyiR7xVXldj2c2GE1Bu6E6bFIPFGlMvjTt3hhA\nqZMqZCOUhHIKcjS6cavTOC84up3MNXghfPnekLBgqtrvGo58Ojni1+00/R3/\n79v5vbnWwtLvf/R+xuB9+BU/JrMgNl2sp1eDT5Qvt2lK1VQ/hTwIK76H9MAZ\n14TfT46R87afSV8OF1CelH63F+vOO8QakbmCPCtZueojOtItK7st+XhaKU5T\nQZVkj67haOu9OXYAvPH5Qs8B+tqqXxn9/HJU7+lum33+VfdwUmwfUpvr+8vI\n/t5u\r\n=4MvU\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/mergeConflictMain","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","browser":"./dist/browser/mergeConflictMain","engines":{"vscode":"^1.5.0"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","repository":{"url":"https://github.com/microsoft/vscode.git","type":"git"},"contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","_hasShrinkwrap":false,"readmeFilename":"README.md","activationEvents":["onStartupFinished"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.99f71a032e_1612486349780_0.11504179885396737","host":"s3://npm-registry-packages"}},"0.3.0-next.7323c52084":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.7323c52084","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.7323c52084","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"1b5d4ef1cf0a53b414938093b9066a2f6ac61786","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.7323c52084.tgz","fileCount":12,"integrity":"sha512-rqxyqR2RWBv0OY73px1QCfnjo6bRjlb39hbE7irxqdt05Z2Vp+zhqWGHcjb9AH/i+duzBxuEwff2VBqx4kH3Cg==","signatures":[{"sig":"MEUCIBJBa0TaCAnuSkgJyXvNlXCk37z6TtK0OQ40ovDOywxKAiEAxAF/zjV0W04VCVNnlpTSM5p3CvIx7swBH2Df/Hz/Zes=","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":106357,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.13\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJgHegOCRA9TVsSAnZWagAAl1kP/0JAlUF5LqYH69by0i1C\nK/8VpYiqdrJIuUx0OTm13M/OpnMF02ymirdteOJASwsU1+C6jgwRChF0uYxs\nN+nh9evM2KE2YlVx/8x2q27ctKwGk4LF51DfVsbJDTHXNKs59xWj1f00KfEV\n4XUt8/gCCkcsD0uHlpVaolVPyVuO+1V6ML4H/Nq54yBwf/j2803OArOSmL1n\nQkbl3s8/suJXaxAvfb99J/jKtbpkqJSURk1aAc/P8OwB0xcdzxx43s+rJEIj\nOvQ4/onEBwWt3ZvAnL8zmxNSbqg22hcbaed5llKVV3f/rlMD4jEGp7QFguXj\n/vZ18JH8S3F5kSAJQ5EQRJWbDCua9CWadsM1mQZsUmwx/92KL2vmOqSrWv9P\nkGy1ly1hSlL+4ie8MOocdOqeBduBI8McDEouhMa3ZNEf0uclErVJ7MqgvghQ\nuaplMqlhHFW6vZeIllURIYFihbpSAHuLJ6YF2QEjwyCjhaedfd5tddYVJrvB\ntyHHE4Rv/IeFCJBg9zmF46PbjFe9REpEXTBv5dIs39Iu/3C/fF49S68FvjL1\nl+jPhJkiVX8eJHlfheSJIDAeTXB2kUKOBPAHyHGtPNs6qiU7A9CmRAzF40be\n+/3Jem/X0GjCAjAywvQbYTsQQ7Upc+6QjR+/DGuwimVAzOH8U4Mfs0hPNG+2\nVUMV\r\n=8Mk0\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/mergeConflictMain","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","browser":"./dist/browser/mergeConflictMain","engines":{"vscode":"^1.5.0"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","repository":{"url":"https://github.com/microsoft/vscode.git","type":"git"},"contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","_hasShrinkwrap":false,"readmeFilename":"README.md","activationEvents":["onStartupFinished"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.7323c52084_1612572685574_0.4051824739196648","host":"s3://npm-registry-packages"}},"0.3.0-next.afd102cbd2":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.afd102cbd2","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.afd102cbd2","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"0c5d352e351405b3cae0c6381f5ecf67bccdc3cf","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.afd102cbd2.tgz","fileCount":12,"integrity":"sha512-+bI/EvZVMC6NpOdvgi65GVQILJjCe3YyeraHBI76s0AYyjYZ9IT4uPdwGGU8uewsG5Y475jZtUj4IcAqo6tdNg==","signatures":[{"sig":"MEYCIQD4Lgvbb//Yu1bAwX7Ikp5rN/ipM4rZHT9VfMYZjb4UUQIhAJoWYc4Yuk7M5nnER5Apis4ND+uP8GaXY/j6I7ygnBqw","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":106357,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.13\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJgHzsICRA9TVsSAnZWagAA3UoP/Auw7kEigZSQJ32hMtGn\nPEF+CpcLdlNH36B4FGNlvsNAQMGf1xmTeaArYzsvFuDLFMueePgTytUhIKll\nTRz7k4/P5ZMjkEUEpbqOu95T8uHlC4sKXzcOSmK7VzM91vfzVN35b0yqsFz1\neUHIg6KhdW82EsEKhgJGMTcebJQ7Dmwz4KKrmYCd1/zx5hObAQjVsT70LYRi\n6Vup7R+QM+Q//J1xSsd19DdORETlQLX090HNHa4R67YULNSXLZ47qHECcr+0\ndI2+8azdzmgqIXYeSbmVOsVbJRVO6kKGY233DmvDTQDqnBd0r0vKDRcaRl5r\njKH/BMnEkuRA9iSW26ojy0h4iUnf1zPjTIj0RpGuGBhqnNoUHSDHN/lAyLPe\nXTg75J9pJMybRhBNgXWUZdnExXayBjHLp/JTv5ohLSxpqlfdv8SpStTb/Oqk\nHYtPml/OPHNjd4fg6w/478BtBsgR9NkNswoc0m1b0SkEiT6JrgNU+F6eMvAu\noeEPBDo3sszic6fZgiOp9W6seAED4J7HN2bt7BV05SPP6QowZH3rVWfxUPL0\nqQWiuc4t8jwnJzEDZKwkloD70Eh57cV+Z9ZONW/NkignD6LbMDT6y03d6AKX\nfu9ISeWJlQZU3Nlmwf9ao7lA2WFDjTgYDSaDMqmdqPjTxqswgf5QTGj1xZkm\nIujz\r\n=Ip+J\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/mergeConflictMain","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","browser":"./dist/browser/mergeConflictMain","engines":{"vscode":"^1.5.0"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","repository":{"url":"https://github.com/microsoft/vscode.git","type":"git"},"contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","_hasShrinkwrap":false,"readmeFilename":"README.md","activationEvents":["onStartupFinished"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.afd102cbd2_1612659463701_0.5233447204470425","host":"s3://npm-registry-packages"}},"0.3.0-next.ff03697a1a":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.ff03697a1a","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.ff03697a1a","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"5f930ce9efd4a82bc499fe7442279b2f4264b257","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.ff03697a1a.tgz","fileCount":12,"integrity":"sha512-30kTKhtWekNmpmqS+ZYZqRjSU4NNLocgKZ7GVpTVxRfUWc2WzZjLXqb9OHPGt7y7IRzIY8paKT/3Kvc52nWlNQ==","signatures":[{"sig":"MEQCIH494K6SCdMQmUX9Z7TCLPBPWXVcMod1R1j9e39Kg+0dAiAEwFNu1aqvpm0nw52bopOeG5NLFtpTNXRrILMIyDeiiw==","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":106357,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.13\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJgId1JCRA9TVsSAnZWagAARPEP/RWzxXnu+xSANjGHKh3g\nk7/HBjjxK2+b/k9Mi+zTMOZwVs3iEdOz4aUda75sCUVtfcUEkYITJ6T6QIrt\nVdoYREexGBQW7etli0YpqYBoqKW6idwpYCMNlX/DTzpx762adJi6z+D2mEzB\nQISEXAgnCkzVNtm+8mUGqe3UTEYJ2Q9jT02/4BnWbqmycFVgigy7BlShM13A\nBZlMHWU8bht+SFJHMY6zy0E1j4y0XX+GU2Bh4rQzWe3Dd+ZLY1IS46kIZEkb\nNotyMYy8e5VnDASwini9/60wH/SuIxervtTt8UBdS+4E0Kk2lbbQnPM7UN+e\nBOmbsSP18uo54ZBQiW+wovMzKMrbx9cb+YKr4MQB2BTu0/qpoIUuF3I8LUXy\nRNNgDIU6rlVDoAWhWKXGVES0eFbcmX89zk/Sw4Cung/m3UvWd1Rqx7amvTOl\nM7ln5/QwraNbEdxqqgi2+TehjMy6fqOxnTeze7aubLZHt1PLbTZ0vNOu7sV2\nH0X5ZEk8c8WvcphTDU7r2lCbjOU5BOCBDw03jf6NCOjfJb8WSc0I/APG3vLM\nKiDQ8rHUqEEvwHUrCjlrRCom86cQ0fQIWFOA4zmNkYdx9igm+9yjw93XM4jG\n4Bts9rZCgcukbdXBnNDh8Tn7AVLOPl7eU0gOHnqzuwxc8dBgosw1PReDX/et\nP2ab\r\n=CN4O\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/mergeConflictMain","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","browser":"./dist/browser/mergeConflictMain","engines":{"vscode":"^1.5.0"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","repository":{"url":"https://github.com/microsoft/vscode.git","type":"git"},"contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","_hasShrinkwrap":false,"readmeFilename":"README.md","activationEvents":["onStartupFinished"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.ff03697a1a_1612832072643_0.7454909424040563","host":"s3://npm-registry-packages"}},"0.3.0-next.9070508076":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.9070508076","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.9070508076","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"93f08cfb567ff5b79f683b58d7d7603f82d4f0ba","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.9070508076.tgz","fileCount":12,"integrity":"sha512-f2K5VNwbe1cNeXYoJT4Ef7b8/5g4G5yUyBkBQpL1Qf2DkHHLvk9tycSutzAtGuA+l+lSOa5xhOwnlkSGy9Xwlw==","signatures":[{"sig":"MEUCIDboSNYOFKL8BYyE45he9MAW20sOWD0U/LnbpRrCnKr0AiEA4OEX8TLU5yii0KohKxxFHUuj7hdii0YWufBB/y50Sdc=","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":106334,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.13\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJgIy5dCRA9TVsSAnZWagAAHYAP/3vA2a6ksXyuvaYpEsCc\nGYRtYyi1SyLwGR6WG/TpUUUsWwl5iExHO3U1cftxZVUMNVAA0yzgDhmZ+Ynp\nJPGi7LLcsCk5SsGb5kfVvus14qOL5YENSQYxuvBUGGTljEyxtPxQ+bVY0+K3\nK+uZSTlRfmCwdO5tihuDtotd9vAUEkC6M2XXq/3SUFgWJRVrBueCT+6Zza6w\nQqCq0Yz+oB9gZcaHrKYTFzlw6VgdTzQ5xp9UVUuXNbRDelYEYxSSAUjXSIRh\nO1MlmfeZ70kqFxlPQac83Bo+aFBQBeNV6ed4rYmhlEMUsSDnq/h92qGCt6m2\ned9E0AB26dRS4IgmuiJgSZ7XzlwZNcxe9AKiCR8dHymY3qWUO+IKI6Ze14Wq\ni76ZveZXStDlNWaPXpbXCjWraPSKz1M5urt2nzuIkvmOhz+MS46Xi96kH5f4\nGV6PfEwz3yonzBA3WGhmkhQtbVdQ1umxldpbNakV5ImeJLx8Dob7pyrxRQdr\nMh9gZz/Sty/gDAeO9G14x9KObx75cZYYeFTroGoGyLCy97bugKyraKObWdnO\nbIVJcoSoE2F+vh6yBmHG6nnlMnQfLqryf326ADrMk9X4qK1k3QG//nVddFhZ\n0D8YAtG5/vAsWHDm3QIdrd67/hDt4EbARgTv36TwWigiupQ+XTNq5LWdDD+H\nG8bi\r\n=q8S2\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/mergeConflictMain","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","browser":"./dist/browser/mergeConflictMain","engines":{"vscode":"^1.5.0"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","repository":{"url":"https://github.com/microsoft/vscode.git","type":"git"},"contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","_hasShrinkwrap":false,"readmeFilename":"README.md","activationEvents":["onStartupFinished"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.9070508076_1612918365281_0.5355159107960525","host":"s3://npm-registry-packages"}},"0.3.0-next.c36a09929c":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.c36a09929c","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.c36a09929c","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"4d11746a8d56b63e9c21bba56bf9c7d84fefde61","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.c36a09929c.tgz","fileCount":12,"integrity":"sha512-sOZbfIOq9mw8nH5lOXwpLIDyb7YLdnO73oUQ/z4STRRtk7hiub8AjLIXPhPKcwgGYmRRDdn35Pb7VwW9xNk/EQ==","signatures":[{"sig":"MEUCIEUxQQivl1ZcVMEaCHBtshlf8Yj7Dt5QL1BwSUUGpG8tAiEAvNqUNO7fUum0jpTX/MS2otYtLsaiBKAMBPmYydK8gYY=","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":106334,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.13\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJgJIACCRA9TVsSAnZWagAA2K0QAIWkAoXa3ifF9oQXE81/\nqXCxROetneqwvc/KdyIs9AzZ8AgRzzNRl23koW8eJSZlDpLEhXDxmAf6hnEc\nEodtIY86sz2bfW+6HgRpV/MWaTe8kGWtJ+BQZ0PqJnq39QpF47aC0T51kAaS\n5lbz1wj4NkzlKLSrRjh6cIpd0p1IVVjb3lNjhUV0o+rzy9Unu1LbeSJtPEYH\nPTeonQYFj4T/oc0MkkT+EqGupNfCSQiRqFYuX/o1vd4T9e35PYYpCVGKsaZS\n58IHTDztC6sRY3bhYUXYFHaCU7U9ypzEDBe2bDVceWCkMe+nAqKVVoO7SRRN\n7tUgMErMnWAHX/sEVNQWdWihh3e+MUyhgq7ygyM90LNOyh8qLGcJtOkrXFjW\nYoomkrbGufuNVjBlAiqHYZZlObeHGxvQK5optm9It94//jnCWFbYx3xOrsNU\nRoTIETckrpAMqCpY4M/DUTRdzjPQNDPzszmXOdNGgqDCfpkH6KZHE6Hh/eTc\n2feI1kIDpZLfIOqYk001pyPS9aXE3tQQUcmZi6q1d/8vq+KM2p8xA2bNGcKo\nsOSI/Ixoyak6MVg+KGVthzHtIqpjmJVnKf4I9xh9yZm9+DpSTVuUbfOynOsd\nBGoCFAlFS/Bho4aPRl5jhI1ibsteojIfRSclNqjyb22f77pnn47acDNGbf54\n/M/c\r\n=Y0es\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/mergeConflictMain","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","browser":"./dist/browser/mergeConflictMain","engines":{"vscode":"^1.5.0"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","repository":{"url":"https://github.com/microsoft/vscode.git","type":"git"},"contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","_hasShrinkwrap":false,"readmeFilename":"README.md","activationEvents":["onStartupFinished"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.c36a09929c_1613004801789_0.639873309288914","host":"s3://npm-registry-packages"}},"0.3.0-next.ea865096f1":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.ea865096f1","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.ea865096f1","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"6c309e00b60f5a436c229e5dbfd1fabb44383cdb","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.ea865096f1.tgz","fileCount":12,"integrity":"sha512-bBRD52hb8O9CQnyIllVgSrr4Uprst1HqSJIDLKUq83+wQ53F4L1f7lgS0hIE216WfgwFC2bEsbiChdIAmX2PuA==","signatures":[{"sig":"MEYCIQDHElB/n3BoI7j60c7igxgLc8lJUHhCIrcLENFrQE2c+wIhAODc/45Aewc+WmTOHnzh4xpwzCmAIHu4Y9yx9Q0rolYW","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":106334,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.13\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJgJdFiCRA9TVsSAnZWagAAXAwP+wcFQhWD18XXCWH3tr4i\n7jwB0DXTiMF3hDoJkk9RSsEqFXMgN+gJi6+ItHqDxkxvsYJcH1594rP+svf7\nJ9GLl34xlPPjzFAU5SFMI6FlhGWPnbPYiRESXP1qFr6jbI/zz3J+1ZOJcslw\ntJ3ID5WRuJgaAr5q1pDtoTjWASuqfXmdB2QbaENmbgjRKdMkQ1wjF+oDHJ3a\naI8o3Y+vv0x9ig9v8C8yvUudQ7ikvvfVhOvcADdqYd9nzs/OQ8aHKlfCDZUy\n8HnEktbIQmlukhlOuWguVB30yRhPV5UXtvQouVJvNOwXDWeEwmT/x7LNf9gj\nl3tIvBkR2YviH8tWneILhkuhuNl+mXCk7QF9zDG+TA1kILu/xnrfHoxJgp6w\na8D57vXdp+Gn9FZxmmmckFnoeQSKoEwh7tLLsmjHttpdJ6+SHwU4yBTLP0Gu\nj8uPbN6rR1H/s43kCPDDQlDo0ighY0Nk+mbM2jJCJN6cXRsxz7Gsvmf2Pv7n\n3+WiwAIbylhNA6wLHCjA3ThHYI7PTHuc+oe5M/HczXbvJxQlH7YomLxb8oiK\njLbSuJV6umyMR7Gh2oNw+cloEmcA0FfcnhVifLH2JSVUn+euw4z0+/AvfhJ0\nNghLQR6aa+gHemK1Y7U4BxKpH6lBorHszCcAeAtMuFLasdAyxqSH4F7piEZS\nmcp1\r\n=twuJ\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/mergeConflictMain","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","browser":"./dist/browser/mergeConflictMain","engines":{"vscode":"^1.5.0"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","repository":{"url":"https://github.com/microsoft/vscode.git","type":"git"},"contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","_hasShrinkwrap":false,"readmeFilename":"README.md","activationEvents":["onStartupFinished"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.ea865096f1_1613091169476_0.2833516229618742","host":"s3://npm-registry-packages"}},"0.3.0-next.a0e0324a8d":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.a0e0324a8d","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.a0e0324a8d","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"2728f9a57032ca185dc9f12da05fdc3f0e97d7b1","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.a0e0324a8d.tgz","fileCount":12,"integrity":"sha512-UvtRTIR1qGQgSE3DTc61l+UIY4lxtGYZmJK7mivuCzAVjpDDBUlcfaipnE0KM4qSSoHCiQy+67Pa1I6xEAte+Q==","signatures":[{"sig":"MEQCIGkaHQin82IGBEFYVPaz6XB6zzy2ws2k4pq/jJopb1Q1AiAcD+4IOxKnlV6jupH+uxQW+v9Mw2zUOhOUKmnBaImuPA==","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":106334,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.13\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJgJyLtCRA9TVsSAnZWagAAgmIP/2sFVxeftoYb2sHeLHdE\n8jruk2+SigQawcdlXnFShvPiZkksaPEjjhkUhn2L1FlmNDy8JyA1TTY8hE6E\nzjHKEC2zN2Gvr84MrUjHPqIh2mrY3VejfYwdZyQBxek/M/BC+qsCWWli/JSF\nB1SHrxirTsrYtpytOS9XqPIYKnPrsyLgJw7ltmwJ2SPv1qF8mEJ3CeNeQdIr\nmYzX/qrvyxLX1QKNVOvVP3sEkbHDWr6fgceRRovHLYKH8/yewd885ayZihPN\nxAvWlOc4eEUicZUu0b5PWx6igYq48MsvtaesjXG612x3kywEb4w7s0+z24c1\n+QOGdHloYN0gZvtjAeT43dX528j//Bbe+dsKIcAP+/EqMhN2mAcx9Aglewo8\niHpHZ5hUNsySP0KNr3YYJKs19dLyltTjlgLZ6iE7SwZCz3JVJZuZn/Wxrqf7\nnTuBVIKEJqcTMbwmwoJFPpnLih5Gx+0jjaNRPgn1fTZc2IOxsd55XN/1Bbvc\npN1TTpsGKM2TqUZQi7ObgYcTxbkM+6c3NTtK7zDSNRjSnQl3kCDrpuaIlS6z\nejNtvncW7wQsUmNN86Qj8sQjzjCOFEkZhYPaof1/eQMIPKrRdvOeBp79bgG8\nKH83dARuzesogaTrLwGh6GDAeV3M7hZ4LRPy/Vt3Eb9a1Aph30/NoHSJLASR\nnd0a\r\n=XT2J\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/mergeConflictMain","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","browser":"./dist/browser/mergeConflictMain","engines":{"vscode":"^1.5.0"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","repository":{"url":"https://github.com/microsoft/vscode.git","type":"git"},"contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","_hasShrinkwrap":false,"readmeFilename":"README.md","activationEvents":["onStartupFinished"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.a0e0324a8d_1613177581209_0.3213441916689892","host":"s3://npm-registry-packages"}},"0.3.0-next.a699ffaee6":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.a699ffaee6","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.a699ffaee6","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"dc9fb235629ebf7eda59b3c48b1f0056629806c1","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.a699ffaee6.tgz","fileCount":12,"integrity":"sha512-MupIZifnqIAMnOEtDjKVKrQ2bj36zL7aUZu0wkchn6TP6R7mGP4aFlFkEfAlUOGT2vqSDbpZ4g4t8lqGYq6lWQ==","signatures":[{"sig":"MEQCIBsZ3bkhXpnJauwpAROPAfHpcD5cRAmxGcyz5SL7yXa5AiBxX6i8bTX/cTM22x24u8ieOt6+av2XaY0flyxaS69t1g==","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":106334,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.13\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJgKcYzCRA9TVsSAnZWagAAeRAP/iAKziUnFjikfvbOmp5E\n8g8mJVvQYYXgTXWRTMazu35CmfJA0jzznwaO2VCIYwYD2irREMjw3319fXSL\nNdM7ZTHTSEaRoNoZ8zdV6YMMPn1wsAq3Jr9ehO8sNBgeDX5JKknHJmbibeWH\nik3YcqDnDWKgCphfGRqioznXqygyFSUmvIVeb+N1vp3FscIHxM+LzfYG50bC\n0Vqffm5/eOr5OxpPZN7sbn/Tr4+bDkHEpWp4ieLrAnz5WdgQDl75/aK2m+Xb\nDIHuhy07N9eGb8+wBF97zOyW6pOOyrJqVjIwL81/R3DDosecuoQobGTkf4Gv\n8LrV2m5PFhJVq7Yfuivt5SJDVYyoEZ/UL3teVTU+y6DIlhJ+WksM6ZfIPz6Z\n3ltxQQeUfruzaLqAPGLcvJFljV6bMYf0vJKJcxv1+i7j9eDV2YT5eHlpm07+\n2oHTEk+9lKMY/6RjTAIEAk01U4D6jolfv5cIWUOgcX6UUnSUXu49J6dQHvcI\nP11b746njghWBmx6NFt6+KBHwO2OwjdCNr8Iv9rbDOB+4A8fjDbj/6m79A3e\n7Ak+Hla3qLfjyODRjn09F+4Wwj9rgbosG5bdpLTpbAIwgTVy1glz6gNUl3QE\nTUrf7gov5SYwcSlMELZYxQK2FolvX3heqW0hiIBxNwqkkMCHPWPuuFZZ+40k\np14L\r\n=7ST2\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/mergeConflictMain","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","browser":"./dist/browser/mergeConflictMain","engines":{"vscode":"^1.5.0"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","repository":{"url":"https://github.com/microsoft/vscode.git","type":"git"},"contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","_hasShrinkwrap":false,"readmeFilename":"README.md","activationEvents":["onStartupFinished"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.a699ffaee6_1613350450840_0.9176400363347192","host":"s3://npm-registry-packages"}},"0.3.0-next.78cb4cfc32":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.78cb4cfc32","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.78cb4cfc32","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"afc32856bb6f4dccd14ab8687d37aed546a8cccd","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.78cb4cfc32.tgz","fileCount":10,"integrity":"sha512-Wb7nRj0LAfFYLP9U1FvS3qPTD4Vk9JOI/2WN54972/UizOgzMZw8JZvxgok7r2adpBvz/sV5LMqvKgKs9PxIiQ==","signatures":[{"sig":"MEUCIQCHX4LzgZOs7knCk5W3XqqzJX5KtGtOOUNVifqSO827IAIgO2JWPJvUJHMFeSUvBrineYI+WxWnyBltxT7hUQJStwI=","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":138751,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.13\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJgRnt6CRA9TVsSAnZWagAAlS4P/RIIICJs0QCFh6sSm7qf\nDc7ISgBBdugWGIjSkhTIzpg4ZBFKqK/DBXovU7csohlrvLpVZEQrxsW2uEKF\n1VOkYyvpBDWU050ujohAI+BEElnmZhwa8B5zqh694RjuKTazBDoXKfLhw0J9\nkufvKX0YSx4t70WDRlI21vp3nbBQgr6OvQIIvy4AkJax7JuUAiuVmjbSyVaG\n2u0HxFaUvgT1hFCTpDw6Hs9+jcuF/K0TZ0uSrJDd3JMA/pJj7ibbOBChDkU5\nY/kA2DFzh/p5LKbNyT8y3O34p+2Hn0CXsoyF3ukbkuQZAeUdrioFDR3qV82N\nS4TJ68hzWiYwiRa0IWDbSt4yZrZCCsjNExv6jZEkTG/uz/D/Is6Fo1gXIqTc\nHAqKfhzdQBXO2V96g6zMOqaq5nDnhzIvXWeZfLcv/V4T+8decqiiIfypyQ4w\nrLR4jfVhL3LEEDbUuIqPmq5vUaXxA7k1DICqfS3oEMEuik5INyq+MndNuyIN\nTVXxnhaRNkQIsR2XdYICDbwKQdr4xu1H76chfKuyvKz4djQPOmcmj1+3+/mg\n2IZDJ/wgq/pN0E64t478vTE6jVBTOM5oW1Q/1taa1bKB0HJMGJHr25OJTgYC\nlkA52E65aS0hO1qwjQsdUst3e9CbagiwDcvy9I2plAAn1uD3Mzu1ccS018Kb\nVCFT\r\n=Q75S\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/mergeConflictMain","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","browser":"./dist/browser/mergeConflictMain","engines":{"vscode":"^1.5.0"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","repository":{"url":"https://github.com/microsoft/vscode.git","type":"git"},"contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","_hasShrinkwrap":false,"readmeFilename":"README.md","activationEvents":["onStartupFinished"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.78cb4cfc32_1615231865780_0.27395757949040367","host":"s3://npm-registry-packages"}},"0.3.0-next.c870a55b70":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.c870a55b70","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.c870a55b70","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"2ba4f2625dc434b2067d7bc82cbfd2de90cde616","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.c870a55b70.tgz","fileCount":10,"integrity":"sha512-GUhu62pHzb3BMzYBoXy8sPWSERoy1fRoimFIzJPXUwXb+tdK/q8IglsTyODQNCf/BIJ7eHAxqzyRqKV5e8QALQ==","signatures":[{"sig":"MEYCIQDN6S7S0ffnGVLR+XPKj637I33Rc/FWtqG92fOKhQltBAIhAMcMK81xS8Wamoy16rHzFUpTsK2oTjaBuMz4+EG6zM0F","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":138751,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.13\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJgRsdtCRA9TVsSAnZWagAAKj4P/A58PZgplikX/XRSvEuc\nRQagE9AOLe62qajwSE5DxHBEDqbeF2zzcYAuYWDmkiL7UswTzIDRY7YDoCih\n4/eGwilxTp5GdQsy1zE420/Cwfw5E221UD4sGoXwEh7Zq9Pa/Wudfs4AMXah\n+BywI6zYojLHqm+orxnjTbAMk/syJ3/HOwogYWJqVZvyx0fLOAH11PKe2vps\nHCL9cZR7kP1x1IELNJz1yLonMeWTD4wtrCtu5whwSXUHV8ufiWh++NijkAzK\nbLsxt2BWOdaNctHjSJU/wecRMTCHRq5g7ZRLOLXVGC4Q0NonqXmnx/vCCMhv\nyRU4VKZc14alZSZeLLNGkzkF7QSwJEVw4YDdBgAHuwzXjBVihNEBkfaXeSG1\nkYD5SGBxl9z8bPhD90jR7T49LaOkXUaoXJx8muNqWiFRLZ42dArd65p5rpxP\nCwiIaGVZY2xHXp+UZ/Cxu1XUzTVX5PgCwpZF+McTFZzxkjz4fLc8dTWJ6ivl\ny7usBSRxmeKr4bYOCepKLIZv/Qx561JxLN3VkdFlL1vXFR/abpD8Tfrz/vwv\nFmSpwEGtcTD+tKQWqru7cKIQSlZ5k+nVe7KBQtZeVD0JZBJQPulfWIiVUbBe\nxXPxUBrHNGkkE2dN/Rr00X+MJRb9vyDNInVkjgy/qqJxleflI4+7k3hwfcje\n/jaK\r\n=rfyL\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/mergeConflictMain","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","browser":"./dist/browser/mergeConflictMain","engines":{"vscode":"^1.5.0"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","repository":{"url":"https://github.com/microsoft/vscode.git","type":"git"},"contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","_hasShrinkwrap":false,"readmeFilename":"README.md","activationEvents":["onStartupFinished"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.c870a55b70_1615251308543_0.3309899681904336","host":"s3://npm-registry-packages"}},"0.3.0-next.d4ee684c8d":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.d4ee684c8d","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.d4ee684c8d","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"ae5b5013033c8e41fd782b7adb46c29ca16502ea","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.d4ee684c8d.tgz","fileCount":10,"integrity":"sha512-yvSF66wwN/I4LrKNNhgwsqnPyN40LL7gCi8uBL9M438mONJosGGKU4sJWFSlCdNuYwolPQwjB1No3wl1nCtR/w==","signatures":[{"sig":"MEQCIHUitk6MiH70vAE5ysuJgoysxWkLLiqk1dqW/gOJ/v9aAiB6to8Fn3Il3yae4hEghry57gupjGdIenFBtFCY0MDxgw==","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":138751,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.13\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJgSBjKCRA9TVsSAnZWagAA8rsP/RQ8yCk7zFhAfu9Ux8KF\nR3SpzQ1NSa5VgbDdZ9jABl+kBmSvf2xpttShg8B0NrzhRCd0t/x/YO1zNyXi\nriXCgafk+wp1jB2nmPtAlISy9Rk38OdU5lsoIQqbRTiuejax0GK5pc/yjtIp\nScUww9k42Zi/TNMcPx2wdWz8fcbJD0cSIkeKFAN2BrC2uZ26QcXcS8GIAp/f\n6wyNILOPfH1iWJqp1JriVpJFLLkjhuovmmLAyD7EkPFXKx5q2rkGBHwJZD/0\nb+WrE6KcfOTJr8pxP5S3sXMvEE7/fWUD0l5kN4JvkZ7rU6lbb16sGnhCuEeK\nE1+2YKrjJTlebhhPu7x5Ltwdr1OQzjBumKg2KRimUhjeC8A/OXgm59mfEC5z\nGxlSi2a8Y6FjMFBddNG+lkQDjAG+dkTdiWmEtRLDUYqJVAx00k/OOa4xzlUL\nHqWxOkD1LAgoEnWONrgkTN5KowGg5wxPLfKFxYLE1pEz47hBdNRJlpY+mpl5\n/MimXLtVpkVCDc3o56qZD9G4p7jk9coXAQqoQYvxWFcji5xqCpVLcisCG4hB\nuGGVqjfczFCER27U+C+mfMc9wMwRc9bj0o3HnH+Axp6PotGUx2qj+geMtsd5\n/Idti2Gs/htebar1gzswePGfxKE+/M5WaoYpjxtxJKDSj3kyj57VXUCmBDPP\n8DtV\r\n=NGJ/\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/mergeConflictMain","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","browser":"./dist/browser/mergeConflictMain","engines":{"vscode":"^1.5.0"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","repository":{"url":"https://github.com/microsoft/vscode.git","type":"git"},"contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","_hasShrinkwrap":false,"readmeFilename":"README.md","activationEvents":["onStartupFinished"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.d4ee684c8d_1615337673609_0.5304772388843277","host":"s3://npm-registry-packages"}},"0.3.0-next.07d02d3e2b1":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.07d02d3e2b1","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.07d02d3e2b1","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"b87ee3dada83617a5bc40ae8941ecbf2f98536f5","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.07d02d3e2b1.tgz","fileCount":10,"integrity":"sha512-WSfgID6m2z/YbrZNmJsROB2NfjY4KvT9X9HRde3ktQ6HLriVWlXaaBHD/R/fbvbsVBty2HjdPqe2Rt+xBXOk/g==","signatures":[{"sig":"MEYCIQDeeHW7taNmHzPEI37WtuCYTYuuL8zaNzeNfCmm4DfJbQIhANGhFYcQruEX0c43Al8W/EmnBNAZVBX2cNX6F7jWVWo0","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":138752,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.13\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJgSWrVCRA9TVsSAnZWagAADYkQAIikj//SBMH0U24BvY2N\n7lwXo1MYUuVR6cOk+kVzBeMqDlvsuJevo0RrlQbCO56Q6EIx+sFu5AS98KKB\nVYxeKgtaZdAwe3hcIjS0Q/IQm9AQg/082WzIzgd1g6JD4GzqD4nJiN4D0C/X\nnyf25dybS/bIUlIQLUvQ7yS5Zmm+mfncBSa4djA5wJCQJcE059nOZfFUlkhG\n1S2k16Uitvuxpvp5yUyq+gZ08ONx92X8xwb4d0svWCf1MOdwAJTUkqo//G4/\nkVtzOkNHE2LGTIt3mOAz5atXIxIOSMpMEpqduC0f9ejwFePpqV9jx61GOlaw\noq98c5AHY690KghuaQOHnfPoZ/E1Y1m/trxS8MzzX+8F9nqCVhRBKJBfTB88\nvS5/lm/uVBK7G5Pp0O+bj6u0+Dbrilx9xaF7wThGaj89qmOmIaycFe+M8VDq\nK/WF4jRnxfEfqN24m7TOQydFRE2BPbT0svQZkK9yiVSjWJ/t3RrfINmfdgS0\nPxEDLW8vpfsvqeWjectThVpOMRnTQHwPMiaoG1RxDLsAnjAu2xuNBtKHgGr5\nVr5SatnR3aJZJP9PLGGt6cX4pD7C1K29x72oCHUieQEmr0L1G/mq3RFSab11\nsMv9Y/7QIBfwWPsBltWnFD5Oy4GyjPTC9k7WlPs2l157LS4OsoBXieNn4OyY\n3YeA\r\n=9xSl\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/mergeConflictMain","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","browser":"./dist/browser/mergeConflictMain","engines":{"vscode":"^1.5.0"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","repository":{"url":"https://github.com/microsoft/vscode.git","type":"git"},"contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","_hasShrinkwrap":false,"readmeFilename":"README.md","activationEvents":["onStartupFinished"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.07d02d3e2b1_1615424213375_0.06504295692805928","host":"s3://npm-registry-packages"}},"0.3.0-next.d31566b57f4":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.d31566b57f4","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.d31566b57f4","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"42295f1f6b14110e2f2123efc20d2ebf4d3dc345","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.d31566b57f4.tgz","fileCount":10,"integrity":"sha512-CXzA0Gy0ZuoNLPvGxZczLEp78wPo9KUX+mia1PtyLpzViOd4AZToN+TXaVVxKczsfZ3RDXwnoltT65EuofftOw==","signatures":[{"sig":"MEUCIQCaOWoRet4PyqhHQN3LIXTe5L6obfvbReXdnvPfgtKouwIgLj7M6o/I+C/8J3sYXwfp1FKIDYndi125XJGj70BvaoY=","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":138752,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.13\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJgSrwVCRA9TVsSAnZWagAANEwP/2+l8RgbxG4Zf7e+MxkG\nND/dH94nf5OKRceRMLB6yJtWNklL/qM8z6gFLjTN0kcKGLBHwfTVrYin8MN8\nDymfY9Dd4Lgnemwoc7aFDTOFDAIuDEIJgQmBaRRxhm20T/cr3FO4r2YFa54e\nFIsS9dV9tCphC8OcIdbaZjxBD/hUVMN4vESbCnYY/IplN9n6b0eNoYovwUMf\n/LKZixiqAEdktW4nBTMwszVHcln8E9RP3Xo6XMOxX57gthMLPp8wubKOY7w1\nuzawIiyjHxGYYQGXa4G7B8MS4FByxZ5px+QJV+g7d2OL9Zjd9nOZEeS9ZIV/\n/epaZfm62sfM40pevmjFW+an/3VDewbCh/yUdzcOQtLNCFuYxlGS+x3Qz9LW\nUDT+MEQZBTFH3RgaLIXoWHsFjo0N9JaaKXrPXfh5Df1dPLUEeXvG2UKmDwH+\n7+S8hNvLmOQdh2sC9ywIVu1xGoj4gT0B9BmT9DXEg0A2Z0ci41d3MlYgJE88\nRTC9cj2aw/6BTrdFhPSghjrV1Bp/fQRFQ872PIO1ZJiuXCUCFh+S8Z8ZD47Z\ng9xjmP476ad+5BlP6hz7Gz1vwRGrwPM7OUA19QbHLajEeihsNSfdrde8UkkC\nTBO5I/wRNRzphuKqV3Birvxs0cycd+bGhlx17w+IV++EtCG/0loUc0zU5W20\n1VV3\r\n=Dq+u\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/mergeConflictMain","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","browser":"./dist/browser/mergeConflictMain","engines":{"vscode":"^1.5.0"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","repository":{"url":"https://github.com/microsoft/vscode.git","type":"git"},"contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","_hasShrinkwrap":false,"readmeFilename":"README.md","activationEvents":["onStartupFinished"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.d31566b57f4_1615510548690_0.810189900327793","host":"s3://npm-registry-packages"}},"0.3.0-next.3006ac8e940":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.3006ac8e940","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.3006ac8e940","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"68a5205158315e7ad39f3c38c573e00e53138947","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.3006ac8e940.tgz","fileCount":10,"integrity":"sha512-LDElCj5NgV16fO+0jgHmrYyddSDXLnMRct1PhVYxrVcsgOHyYhihErn8MfxpT4IjBkqG0kvmYN3T+zGOn0bbtQ==","signatures":[{"sig":"MEYCIQDd/WrgLDx9lHxHlxfVKUCLILQfNexo3b0G978jx1w3ogIhAOi7AlLAhGq2MDJvmEl9mZoQv7CZg98/QsLK+Bm70j5Z","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":138752,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.13\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJgTA2fCRA9TVsSAnZWagAAlnEP/2CD5Ii1rk2Xo0TvL/Vp\nSZopsZ6pSxTiLr5dkoYgPD1Asgr2TMlF9lwblM1/40lbNywjnJ7HYqi15MoO\n9olNdc5En+qA7nGAlGnrqhh3kH8Pp3yDKiQd0xADxzBeBUFJjPjh+3QYXSfE\nDPeXZ2utv+J+t9C+Ejl/F0gU3BI9elXpZwOgleVauxUKXaS4NcRqZXJnjsUa\n0hfV+bj5Jc+SY9MsGf2D7WatRzHPiotjKqJ2tSWd8kUN+3ehajMGKNw0ZOHQ\nD3YYsT0MqR0OwPfVMyfVlcrV2J+F1+gkDKno0Q0BCd8g7xmXGm1adlHMsle5\nb8jgSvOFFkAZHUiiSMY/I1qk9osXyvmoWBKSfSjEEibOTFyaTZJqr83tVezD\nr/dsIO73nNhdojmqsYx1smOaWg7tIoF6rOoFOx2iPZhwbDAmo5BJ2GRYku99\nEk0xJM8Y6ggttIFtfujMmsVNhsvhj4rqCCxpuOzNq4V5zs9zOiCfPzFkeWHQ\nB4/9oo1zHi6vUt4PSXF6XVzcrBltLdv8dOHnDoQD7AHc9j0nPNOK6j7v8OVy\naEOwHnwCicwawX+w4hav/XtPaLzQWyrREhfDqtVJt18YWgFy3e+t2glSAz9i\nkp7qYh/kOr9BomslZgDS9PLNZeMeBwyLUmYold0K/M6jnKS6FYh4U4Iu6nSe\n7n4/\r\n=HvOo\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/mergeConflictMain","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","browser":"./dist/browser/mergeConflictMain","engines":{"vscode":"^1.5.0"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","repository":{"url":"https://github.com/microsoft/vscode.git","type":"git"},"contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","_hasShrinkwrap":false,"readmeFilename":"README.md","activationEvents":["onStartupFinished"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.3006ac8e940_1615596959359_0.31389129583698105","host":"s3://npm-registry-packages"}},"0.3.0-next.84fe402d655":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.84fe402d655","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.84fe402d655","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"cba308c3eaee669552285145b363d1ade8de790c","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.84fe402d655.tgz","fileCount":10,"integrity":"sha512-i2Yf8YjJepCW2kTrTiHnNmPiYjUh2M7dUMJmQa1/iv6RNvRfhvY1hCuUD6R62hycW+mt3U6Mdnzb3NMYBgknuQ==","signatures":[{"sig":"MEYCIQDA3rmybvucvLyfvhg6dHvPcaodI9u8m6yLCUISCckfBQIhAIwsBHnCUClzvQIfBXgCk1tetJY3BDt7o2cVLOFhWiCh","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":138752,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.13\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJgTV/sCRA9TVsSAnZWagAA+n4QAIYv/hOQQekkJV5OaWbf\nGhI/VA52nE+yaAK6NxPHD8t/J59jeb1z6XtrFFJ7/PtzmkzncF0egWIpSSlY\nu69+LFKcptrnR9yoFRibrz4/FQxPxQ1VqqryROm0axOmFD5IFvIQVX5xiUg9\n1cYXzpcQ0/3CDBAv3p0P/lJ4uf6XaKQJoGKse65OB22OsvZf5ZIbCB5jilHH\nxgCQXO2Bq1kwyw7+paeNzW89j05PWGnzPmBaQoIPx4AVV29d24KVm8bjvyFm\nIwuoVsSqghvQta5srQMOl+oIvETEkvwiBZxlzg8MHfsFSfktTHsVmY9YELBK\ntAxH2ju8VfC0PF4NvXLTe/qjCMG9FfSG030lnKGN7sq2ZunzcXGBvY0QzPGD\no3ZJ32uaIPqaZui/QJVWFjUZELV9IRrrg/iV2novBzvaKxpc4Z2pt9echBzL\n6RpxA6NA7tU/aZzKQyY2uBWPRduKi+aCGjmFjkZV4rxH0wcbSRs04k2L2dy3\njxiYN+GYWAq5itKOZEXAhiWBWJLyUlGtGuosFHXwWzEWZg1hJHZHGGU3BkO1\nVRsgsTrNHxIOaqtUYetQVk2atCGV2MoHxXxRIYCTByYltNJt9eNdwceqmUBd\n/rsC0bHE5/NMKCSJ8Z3rBDEFg7IS/SSIVvfoR5evp3dm2V9EEdotxeaJJXiR\nvAie\r\n=fiu2\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/mergeConflictMain","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","browser":"./dist/browser/mergeConflictMain","engines":{"vscode":"^1.5.0"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","repository":{"url":"https://github.com/microsoft/vscode.git","type":"git"},"contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","_hasShrinkwrap":false,"readmeFilename":"README.md","activationEvents":["onStartupFinished"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.84fe402d655_1615683564022_0.565106232149319","host":"s3://npm-registry-packages"}},"0.3.0-next.581a659d427":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.581a659d427","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.581a659d427","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"2d83fc8f2615e3d1d6b5a6a5f1cd277eae714a8f","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.581a659d427.tgz","fileCount":10,"integrity":"sha512-dNtddBonh7+wUwzAUTCuxfyDooHgWLHF1O7RtQ9Y0IGRmryKTdsDP0S06QeZ6D3sIO1MLf/vucglFevhLQwy1g==","signatures":[{"sig":"MEQCIBpBt2ZVyoRkAbtqdzICrK91nS31bFVK0aT7vXDrSv/zAiBdgw3jc7dWDSSlT4Y7zzSW+i34KdRMyuOnJs1bu2BIqA==","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":138752,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.13\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJgUVPSCRA9TVsSAnZWagAA0VkP/1HdGao0WoZhkcxa2m7r\n0GWsW3tOwG9m8OhDtDH8/CfL/FUFXjxRRR4yFWcp+aLcjlLg7NsQHeb9SvHA\nDtgLjhwyCdyeetHJtLulLXtRMci+QS69u5j81iIDNYctO19CwiYRM8YydwLi\n//DM1WVrNItEVYL7wem9QLD33pVH4WkwAVa1RaJwcOdGLynB8C2E649Np6j+\nLkAy0LCUNv7ZWkmhqZnnJ7rRoPjgBXpM2D1qSUOe48wSEF0Vg/2m3rn7kfOt\n2+TY0Lfc6H8MVmD69YMk70L/AKr5QPSCxKlIuiAk8IXWtdMtlfjkVdx/8/sG\nmkG2cinbt0vlm8viLKVf/hWNNkg/vCVXqEo0F3KnGyecWThdfYDMVWaZC9ay\ndnEXSVGh8FDBcsLuv7vdk4J74OX4uqTgR7W9+Z6w3m9vLtFvVTrrfFZqankA\n99ZNvcMaT1QLNDwSQAFThyaGvdrqzRDT/H8+hE1XgsmUawwE802SnoqvmHWG\nIBVDjQpohX8s0K8F81LH1jByq1b9xZ6F7vNNeKIY98D7aSB5m60xEX8v06vw\nLUslUoceU6iULmYScAhcqn1CA7/iniQDq1dKEDLRoTGPTJfQwoXuvSazxuza\nHkuyvFhdUyFgyzPVJ//3DKR8+UFgv9hkYidL+NYO3hs1D0WRmPOszwU54xZA\nPJ/C\r\n=TY4s\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/mergeConflictMain","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","browser":"./dist/browser/mergeConflictMain","engines":{"vscode":"^1.5.0"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","repository":{"url":"https://github.com/microsoft/vscode.git","type":"git"},"contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","_hasShrinkwrap":false,"readmeFilename":"README.md","activationEvents":["onStartupFinished"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.581a659d427_1615942610125_0.6718505070089997","host":"s3://npm-registry-packages"}},"0.3.0-next.4b5354c5f98":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.4b5354c5f98","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.4b5354c5f98","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"dd67bc9f96d5ee78e43e99851819174bd78f8dcb","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.4b5354c5f98.tgz","fileCount":10,"integrity":"sha512-i4wzI2+fj3WbWu8+uhogiYu33CeCv//6VCRGcQQ9OqvnyIQUEh1hiEXJENC3UhWxCQVMMkq/uK+r1yIo9UVEwA==","signatures":[{"sig":"MEUCIQCdZEp5Q489zzCpAJKzrJrbjgQC+JRzMJ4qo7Ap7ITteQIgPdFtQHs5Tp3wHKf9HKfVxDf4Blbm42142tFqkAnYTaU=","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":138752,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.13\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJgVUhnCRA9TVsSAnZWagAAC40P/AkMQBBq+pHVDkYoVSq5\nr/UHZSHE2yyGRBTjnB9ZFh8djrERZYrCBGswDxZ2yqOwKqCoXmtxs8d4h+Aq\n7bJyvsbmz22QMCoTInpf0MremY6wCtxjIE5HC6Ndo+zgQeKFAQdv58CGwRYA\nAzTcVa+uVfOaTdf/E01Fp1nEwQt8ySea5x8gq4KiUgLgoxUfzvkc6rcyLDOH\n0t/m90NPAeYT7MQLRJvTyxUjSj6kg/aIHEChlBu17i/xyMlU9Es7DK7COtox\nhMNNwEKFTOc5yzhFe+PpfvpJHcia0a+gV6FX4oghSISwxGGZoK1Z90eZTxX7\nUNBxTUQ9q6T7DkQnhqXU+m84wk4Kr5FDPvszhC5hf/lM9nz7MutdBVDPvKy9\ngmr/Q9FLWb38OCuqq3eBMqlg1a5uOJcdDOoSFdFDHez9dlZngGd/2D6xyPBy\nPWxq6pmIv0jRXi1Gi/qapyCDrjfDgSWMLy1/E8szT7xMA8sDEkvPOyvKpqay\nfUrTu2l/4fqpR4/32d8XonkwgrRbk3vDb2ibcmlZExjg7A7NhE5r2K5VihCm\nXJ1fJGr5Ve+cj0kbYvEYOJwxrZnlPx/br4FVog8xUvJmxy9gEjLI16aLQTAb\nuTD3XMJSmKvOIaBJ8ApXGPlK5ri+S9/T2e8PNq/koxflTUgV97PcD4O3ldpg\na8mH\r\n=OLya\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/mergeConflictMain","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","browser":"./dist/browser/mergeConflictMain","engines":{"vscode":"^1.5.0"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","repository":{"url":"https://github.com/microsoft/vscode.git","type":"git"},"contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","_hasShrinkwrap":false,"readmeFilename":"README.md","activationEvents":["onStartupFinished"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.4b5354c5f98_1616201831044_0.523964835154795","host":"s3://npm-registry-packages"}},"0.3.0-next.a3415e669a8":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.a3415e669a8","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.a3415e669a8","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"790a388de5c526a927acadc0da9dff8132c5d4ba","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.a3415e669a8.tgz","fileCount":10,"integrity":"sha512-blhLVQT665SOJzMEnvmCtFsc3dWlF0VFNGQoCwfeH07QYsEW+n1Omv1qHGWJ4fAv/X4XtCP/OnoettknCOPscQ==","signatures":[{"sig":"MEYCIQDLMfruwjvQuPQH068dTGXn8ymY7pgkPQ+wVEFg6kM+tAIhAPZ7QhbR+lLb0DiDN7tJBMZIUQK3yHV2lM8jWWUXXN2F","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":138752,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.13\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJgVpqiCRA9TVsSAnZWagAANkMP/Ai07kiIvrKfo9UrmZv8\nj9cgfFK+n0euiZSO0T8g3aJbZpqG3aoi4J1abkleL86CgKGWq1OoS+UkB/Lh\nqzH/IfgrNIJdyVSUOJou07ZFtWi5mynUiMsyHrU9T06W7HQpY/Ctz55Zb5E8\nvhm17B+GoWTVQX8UTZxbSLXqZEo9NskP0tNsqh+Du7LYZ0ce+9+Yo6KuWuiH\n8Zwm/KbK/eCgODj7fM+YQpKdoLzy5PMFHh/YQbCyWCK/FPMd2ZXxFzuRBa9z\niMHqQ+lAL0NpHm2iSHKv2hVb7jJstWnbp2Zx3xeK30D6ImeujmI4tUZTFZCc\ntdQjKDcAMy3P7UP6ustGdGmeL4JTHnGYb2UHaOOZpasYE03TNk1DXHSxs8EV\nNEp0ALoiHwd3gaaD1p5FEWXFxdUryq9/KMdbQN4Dq8x1x+4/XTh+BHBo4686\n54BYZ5xOA6GKAiDZBlu5Vkhmo+mHuJSFa4SP6t8CX7XcPOiPpAv1U7RnMiFz\ncRVaCDpBg7Yux4BQnyW8u/2GwSyX4t1a/zWM7WuWvaHJH1l/nqjZLJpgVKPg\n0IsH70rqkbdQF18IDNH1P45xYJQN0qeKkeEIkwAovFLbThQsa5iPjBfPpN+u\nmRk7paCqmeQ2+Koo5pZpSeGe5pHCg/FoDLiuu+fT6aStnwJ0PTzgeSQnLoQn\nNMPd\r\n=9fxz\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/mergeConflictMain","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","browser":"./dist/browser/mergeConflictMain","engines":{"vscode":"^1.5.0"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","repository":{"url":"https://github.com/microsoft/vscode.git","type":"git"},"contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","_hasShrinkwrap":false,"readmeFilename":"README.md","activationEvents":["onStartupFinished"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.a3415e669a8_1616288417516_0.9385830294050013","host":"s3://npm-registry-packages"}},"0.3.0-next.0ab3c62ca2a":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.0ab3c62ca2a","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.0ab3c62ca2a","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"17704a7c78e2b25e8be7d2ca7174e83af5adfad8","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.0ab3c62ca2a.tgz","fileCount":10,"integrity":"sha512-bY5za57dc3K4hap7Ynxg72JM3HwUoLvHaxrEFWaZ9gwytSiyzQ4oE61p+vAmLd2fJ+xgVpOUcT8VG5GbraQmxQ==","signatures":[{"sig":"MEQCIAm4vUpc8986bsLyX7lH0tSdRnIpNxK1h9SxdYdvFwsuAiB7XDpM+AW3iOFSwzoCMBhsw5vE4KhbbYVATenX1v1pIA==","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":138752,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.13\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJgV+uNCRA9TVsSAnZWagAAUJwP/1wAHtGiRJKgxbkXSzR7\nnZc/HUp31PHNaAGVMg9JbvERpWYb9uMhzvv5e9N6feh5BHSP61+KEsYaePOi\nPscv82Y7DwY+b+CBvJ7W2QhcgSY8zwpyMzYEds0GBZoBfKvLHIwXtovHcWYT\nx3tY2VvwSdvNXgfk/QIJXh3qtTA3/z/iqPIa74ri7RcH1RDOY16WZglVcZLN\n5+tlfD0nAs1aGrT2T0Z2V49OLI9J3GbHSVVLgKIB745I1vVj8x7pO4yI5FA9\nEoFoEtftYAuk/DVth0EYceDO1CFHiLB7mKQnJogrd4DJ+KcOjmlfPQ+5II6B\nc60IZ4nO40pMYB6SWkTmRA9vsVSykaZ9PRCz4RQQfHCTzX54lPIgXIXg/by5\nMaD6m0XSF2sT07ww3u2O7g7HdlJo7fL4lIS4i2CtktJK1QCpoKusRfWBThnA\n33uhVyHUHn+yKIZDvOEKdQ/kka8eMbcCYCUrhhpAg8OS7qsThFUZaLW9+GVA\nPZv5/Z8IM9lvgaf0iV47Bay6zGMMANoprO/lxbNOXJpM6GO30KxHLq0QxNax\nA0vKmqI7IJplrBH/zladwX6d1KB9lD45j7fmti0ywJsX+c5Sy0Usrv1e3Zma\njrwoZWWbpXGgAsxE26fksl7iR6g9NK1U7kv1W7zXWhlYE3SN1cJgZ4pdhOqZ\n2Eog\r\n=qjFZ\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/mergeConflictMain","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","browser":"./dist/browser/mergeConflictMain","engines":{"vscode":"^1.5.0"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","repository":{"url":"https://github.com/microsoft/vscode.git","type":"git"},"contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","_hasShrinkwrap":false,"readmeFilename":"README.md","activationEvents":["onStartupFinished"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.0ab3c62ca2a_1616374669438_0.6033656415191764","host":"s3://npm-registry-packages"}},"0.3.0-next.514eefb789e":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.514eefb789e","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.514eefb789e","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"992d6faccf0acc7fba37e0fc0cb4f5a69c80315a","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.514eefb789e.tgz","fileCount":10,"integrity":"sha512-h82dnVIM8oUeGa8n8FDPfsC8t7HNcWjmABlYk3XnaPO133wR6sBiStbDxEGzu2sE4dTvuN4yXClO4AQQTkSlHw==","signatures":[{"sig":"MEUCIQCs9NSj1oG1W7+6cC/RVXIT7jPnj4tzwk1t457HmxpP5gIgXdoFEDydASCbHo67OcWr9Uf3XfcobPhl5fTUxKPS/RU=","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":138752,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.13\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJgWo8XCRA9TVsSAnZWagAA9yUP/i75mD6vvKljR4PDGtg3\n4sa/546AAA+YbwiKbNE41os8JnfPNryPS/dO7emrOAX3Ehuc6MJPZuGCoG6i\nwC+xVF6XijI6OgAZx8Kq7/jP2MIG6FeXRvRuuwC7PSVLTl7zvw34ThGHWh3P\nA9kjAp4IpJ+rNfgcKc3NvFpd/Xfy0c9THxUGX1TKr3Hkx5LBxmxwjTtBwPsx\n4Z8BmeJjuQhjWe7rx95FJI+m06HWflDA3I9YWPYrQxQtQGolt1RzggS3WpOU\nd/aRTGJtJUeL6PeCu4fQ5+K/DQ1xLSWlDW2U9BCdAqNY0Djc/GWB01ZCM1dL\n5k5tEZlG3jy+gyQcv72le+EOulbBGKuHOpNxar+Ysy5NhZBwmpgUBYiO/I7y\nE1m/t8p7n5ls0PNT//kb6LEABC0sNGAUPm5M03OEEoB92Zzwm9eXK9pAIKKG\nvqyHet86PBXDpsSNfMvHEWuSWtDSsg8hCvo9o23zEepqq8CWZgW/z48AaSge\nCGkY1f18FWdFhhkQv1uURt0gB/nbs1E/63VKg1ekINIIfHC5tbEOuPw7HWxA\nGhHpCCO/wnwz4Jpk4vn/ZP7qKu0F3wHRfVDYzcoZe0ueS7aSv4b8sw+DWfsb\nV+e2epQtAfuw850Tu9ip2i2rQ8BdNwLAdbplPBXff4b18aXXxuHrHMvxS/12\nLF95\r\n=3ZsW\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/mergeConflictMain","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","browser":"./dist/browser/mergeConflictMain","engines":{"vscode":"^1.5.0"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","repository":{"url":"https://github.com/microsoft/vscode.git","type":"git"},"contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","_hasShrinkwrap":false,"readmeFilename":"README.md","activationEvents":["onStartupFinished"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.514eefb789e_1616547606879_0.7272783188812992","host":"s3://npm-registry-packages"}},"0.3.0-next.75ed057885c":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.75ed057885c","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.75ed057885c","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"0189e52fcad0276cf01f76f14985908e1ba7e34a","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.75ed057885c.tgz","fileCount":10,"integrity":"sha512-Xo3Xlu6qFcOJUwH9dGktRQnl5h1KlmBRWXOUXoatAZvEwIytNMX9bARnhRzDafezK8xuzUx4+5f6yMLGxsFpJg==","signatures":[{"sig":"MEUCIG3T6bge7m7bZQEYRitNWIKROcduo5ryP2gDD8Es9lMaAiEAmMzjvQLddvF9e72q99VfTo+p+9G7AMutp7g2pVKtyjQ=","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":138752,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.13\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJgW9y0CRA9TVsSAnZWagAAUZoP/3vw+AuOGbB7gx1vME2k\n1EgfAIcE2Fw+aoJSwq++HoJtVPXKwWb61ka7576NPqx18iLEfQiKJB5XJNOV\nCKz5yV4Qtkh0ht3Axgte7RxA1hCveq7/2sE7b3wEbdQ5IWLf0WA00FdBys2X\njR8nZ7Ij2sgUrc9m5qf3Ct+XZzsxHMbroMDaQyHgukikfpnlLWC87BWP1QtU\nEDRaugInsS558ksAhEcQAumj0O6iye+j6vMEuiarc6nhhY0b6JNNd9j9gZsB\n9IkxlonHvorafKiLR0xRf2QObDp7if8/puyJuKhNwymsXIwaioQIFdeQvWhC\n7g9hQnCfeghym6tMAA/rckrmnx3S9tLN4wsTtrpyw4ixysoOn3ogN8uNoFp5\nuyYRQsd+yW8UMA4eAh520BlEEnc3aZJnkIh9NCS6YYR/AG72WSmM776X7m9k\n7Fk6ZWE/sKR3vvb8VBcIL/el0+XrL5XpSyJJZxPq98oi21iUDaNTNCJ9TjvX\nLZc4Lr5dAtquafG1lECU+0cY7y5Q7wizRdyJEGVkMoJd1CFkp4Qzy3qY92lf\ntDMDydlRdV2UnkdPkZxvlPHBwA5b6hgWf6cDNSa4vwGwc1C8vbGtXQ7ocaFx\nZfW/n3X1O4JtpZP21aCKF9Cy91tNJaLSwZqI4loZi0oM8LilLnY+KRLj+Y79\nh3D4\r\n=1eLU\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/mergeConflictMain","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","browser":"./dist/browser/mergeConflictMain","engines":{"vscode":"^1.5.0"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","repository":{"url":"https://github.com/microsoft/vscode.git","type":"git"},"contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","_hasShrinkwrap":false,"readmeFilename":"README.md","activationEvents":["onStartupFinished"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.75ed057885c_1616633012464_0.9738529842158541","host":"s3://npm-registry-packages"}},"0.3.0-next.0a7dde45706":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.0a7dde45706","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.0a7dde45706","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"41fbcd77b8655e57f4f26d0dfb9481518aa7ccff","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.0a7dde45706.tgz","fileCount":10,"integrity":"sha512-oToMZ7h2ficOCGRLjwsmaRBc3EXHuozoyngWwqbThDzrhNt+8p1/DLq1eJlbL0zZFEYnTF/j2pHvnyOFrJ8uvw==","signatures":[{"sig":"MEUCIG2b/ybGLWi09iU5TbEyaY3FeMojADufVegPwQwKc9SOAiEAomvCDCrNHkud/I4EZ8H2dvUzp9deGgfF2MJl/0yXlGk=","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":138752,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.13\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJgXTLgCRA9TVsSAnZWagAAFAcP+wUk8hpVI0ok0xwIkjSY\nn6w2lrj2FhtyCRIGAivlP7ORvNJNfDPbwPTKHq43BLZ/u1GPA3hZd41j93ei\nuWWkKODidpocKxYgaF2XtfJ1DNo58o4pupfj/lamKBmpXGl0yT1yfaVk0zFF\nhrbFKXisvT4D55+YQzh0IoXMpdVQUyXox9c2P8ipjAvzrEIb4EAhXmBTCRwU\nbriNHla76VMwfK3yYsOvMYnk27mQs9K8jnHbfbFFk75giXxlFZwrVfbYySZP\nwW38tTgRw1NPshKUOrWXg6uE4krLeRlPIePPeZjPdH+skJkWv678iTzMSrTs\n41Zf/NaR+D9fFMB8hkKyVbr2pD7lavhMMvoaortY7doYBWlohfjtcqfaVN3f\nyxy6a4GdWDWVHigsHUjr9w6YC+4VK2iXKRDZ3RliqnqoMAs4LiEw2hnpvAUM\ns9g81Kw2S2slm4FEVWc5o4TmQ1yONw623tVj3p+PWbDNoglcOFePNPijzvso\nIW7kewKUhLxknUWqY3UhQ5Z7o66MiJr5yl55cdCj/uTxBPcGNBforY3Spph4\nf5Ng/6Xk9xqo2QpMWyIXlbY7HhbQJVPaj8zf4dkRMoujbmcVseRJaWn+x80C\n111csaZTwac+ybZw63aPOXbfg/VBZWwHTjK+vw2aiI1PlOmCF3YyCE1KtqVD\nwoiR\r\n=CzM3\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/mergeConflictMain","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","browser":"./dist/browser/mergeConflictMain","engines":{"vscode":"^1.5.0"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","repository":{"url":"https://github.com/microsoft/vscode.git","type":"git"},"contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","_hasShrinkwrap":false,"readmeFilename":"README.md","activationEvents":["onStartupFinished"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.0a7dde45706_1616720608305_0.6527428598626046","host":"s3://npm-registry-packages"}},"0.3.0-next.364923c06b6":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.364923c06b6","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.364923c06b6","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"628c54c6bfc6448f8d1dc9f3a419994ffc0f7d77","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.364923c06b6.tgz","fileCount":10,"integrity":"sha512-YWLvSOFukpavaYYgINHRqmS8U0500EizKGg0EVZoppLEY825NeZzoGVlDSgJQa0NBSK6N5aQL6fGkZHgzLgsMw==","signatures":[{"sig":"MEQCIAME3mZSc8Z7ASBIDaZY1Th/z88J5UErXJjhkBi85K7dAiAGuLRRMrty/OEgUQ9+qajydiRCC1FKlSAefUxuWeNw5Q==","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":138752,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.13\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJgXoW/CRA9TVsSAnZWagAAsFwP/1DYn/gJw/IdfYxsGTWL\nvfu812fq4aNW5nbbe2XutwW0yHmdu8/ZFpbwBEBCvf2uY2hFcLRRIKZFctkz\nm1ZdgBjgQS5Erie5P68Bfq1e2Ym4Hfv+W9JrTkMs3E3itQNTfjdFQ5/l6GDU\nG5juKbkHn+/sZY09cN8vRRVvc4Y8JH2bjAQxnI9KbrxbJ8Yl9tsUe6kfN0vJ\nG1S6FVbGyDR/31n8iwHvtaeaDAOXA6BMCG3rg8v8ZMiDASJ8cz9/lVS828v4\nf4QKAxeIH76m4oHdd63eO/GL/REWOK8AV/jfzaVutDEU/36P0Rk0+YERB1GR\nTCCDL0TCM7kkkCnPt/HdKMcSM+AuYtGCF7wUf7D2ADiC3ZE11uKXc2hPIhHw\nro7tqfjf4ngjM7s/EsQxkHQvnfJ6rb6xwAjxFvUQx6v2oWvkz5ZiSE+FB+55\nqfCy3xO2g57MMA1ldAb1+Av3e5Yc0RMFcAlZMTswNv34eJxkAn3m2SXGt4PH\nl5E5Wg1IAb2yL152o+ERt8Kv9dcVpp95hZwjLG7nHXsXKefdWNP3gJznOZSX\nlAtrIU6Zcg/OAzy2IjpohK+ZKbK1fYHQATKMpMgOU0p0/RLuSj/LxO2c9xyB\n5gnTyQi+m0G3x2678+cZzMuWE07l+2dGlnb0DwksXvqitSBdrEV6tCmfcE7r\nw7O/\r\n=catJ\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/mergeConflictMain","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","browser":"./dist/browser/mergeConflictMain","engines":{"vscode":"^1.5.0"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","repository":{"url":"https://github.com/microsoft/vscode.git","type":"git"},"contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","_hasShrinkwrap":false,"readmeFilename":"README.md","activationEvents":["onStartupFinished"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.364923c06b6_1616807358521_0.14987690209706872","host":"s3://npm-registry-packages"}},"0.3.0-next.f453ed8e382":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.f453ed8e382","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.f453ed8e382","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"402a0d61b704b1a93c53073b13bde943496d6261","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.f453ed8e382.tgz","fileCount":10,"integrity":"sha512-TQtJzVqpPtB/aeOOKfjxUS1v9VCiqcp7U3zk3D5JHtPv0jR2gVnVSMoWIdD/LMZ+MXcC7JNHQ9rzZ1YeoF+udA==","signatures":[{"sig":"MEYCIQCLejmcoTbDV4gg7mCellfcV0nza92xi9EwkHrfWyleFQIhAJ4wG3kIrzrQNdrmFltU2Kk5NSCGhMnc0UvFTQZ7jNWp","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":138752,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.13\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJgX9iFCRA9TVsSAnZWagAABm0P/icD3SbfGdg3tn0DQMYq\njo/yqk9vDVY+qlkG7cDJoySIwXP2DGp+CrtyzpEFOl+65ex+kENEhQSURxaS\nLUHfxAsUrYn56ITtw3ssNJ8o3Z2+w9tzCE6JaOnrdPixO5HTMy1utD2saYqy\n8gQ8Aewoi0lyz2jUqtXUUu99g7NeY76qHK5GdzZmRDuD6QwFvygMQqe9Cksr\nqXweDQvV+Q6UOrZIW7yf7JhIj6995FaXaROCkLNrkSJZgOOnHtgYGJYNc++/\nLg0QnLOu2MNJ//aZVMhLYSL1vOy4s0kTf7TVwjBU6xSNkjWS0RghlHWXrVp+\nKHGjwfU4aTrIE2bTm9tovi4DzB3y6p5DhJQgVMSDiKbQVdh8+H/3n0e6Jw62\nqBr9fqm4nVzGBRjJgkmySuGDxRhmpYOmgarMqJ5cLNGdTDROUE+ijbnnMgRI\nHkGHZa54C0qN67PWwIgmHPzQ3bTapChVYuWWSVAA4rQCqLZUam0dlUHXVC+4\n8ee3Vu8V3VhHq38cQCKXG93IfBfN9iecL3JEvYpM7T0yn7GHL8pXyyIRN7cf\noSMdD/oKrKvA3N9/BKlm86KC4IM+/JZIF+TFpWHGgFmkyREZIgRIJ3UgpUxp\noHYBcrq7x8+TtXals6Cj6qjq3Kyj0EhPMCKNBerZSTQVxgb6c8V9cZGywMSM\nghA9\r\n=BJ7A\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/mergeConflictMain","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","browser":"./dist/browser/mergeConflictMain","engines":{"vscode":"^1.5.0"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","repository":{"url":"https://github.com/microsoft/vscode.git","type":"git"},"contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","_hasShrinkwrap":false,"readmeFilename":"README.md","activationEvents":["onStartupFinished"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.f453ed8e382_1616894085006_0.5577473858736102","host":"s3://npm-registry-packages"}},"0.3.0-next.c0fa3dfd3e2":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.c0fa3dfd3e2","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.c0fa3dfd3e2","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"6bab352720f3de05ff013cfcb0094d803470bbc7","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.c0fa3dfd3e2.tgz","fileCount":10,"integrity":"sha512-Sgp1URTPS5BU/upP2uecUD/e0AiYEMAGzFRv7VAWmMjev/NqlVlpjEtC8twzNbYTw5w0SBB8fY0r0K61Sp0lkA==","signatures":[{"sig":"MEUCIF5ABAL2w6uaspQv2uZuuifBAe8/fFTkDYJ7ib/Orh8IAiEAwiP5SLV3y36US6YvGPB6yNI0ZFk7zWq+j2obsYIj2Oo=","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":138752,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.13\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJgYSn5CRA9TVsSAnZWagAAmIgQAKSKChhzwIxenKacqoLZ\nQTcGSr31RslXW07n7kYxZlGMLBgwnZhHU+Dsw0K1NfypSpQYoUZwusq+ShbO\niPwGqFXJ3eX7tcAf5BeLD3F2Epkb1nVYgLhRwmfWgtXORxf+TAZIe4tKmWeC\n/JAqKjVEEizPumPJEc3swGU9o9jxdhazw9lN5RnjrVqC3cU8Ar74ajFvPW43\nABh+utlNapMQoQ5WDdKwjJvF22qgdJcT70Q5H93hQFt7P7MaX5Rh1Skg5sK4\nYpZGds/FRB14KEg5Olq2QnSnbF+KJ+GV528kkkAJdMssnI167U+L0ZNmrSWS\ndpMnEd92PpUIkB7LlHQJ8qpc0MdU2h31Ah3sXlty6PEdjjSOl2BGfLi9/GYQ\nvwKumuBCaGi8uXSuhEasBWFgw4Ud5glGTz/+gn7Q+MN1l+p8xmj6zyGFxs2P\n/qckBkbaJ+7UO0sY/Vg0GCWTNDQ2+Cs0n3sNVyjlyG//90ApVwjgVOZO5pg9\nAeTkiVWCLk9P+1iUUbnPZNffGytOvIbrj1x3w0s4WfleiGhCfn7B4Hqowyft\nOp3h2q9ySQKwpjvdUD61aEVvV9OZX28lRWiRltLT9Jh71E2AwXmnA4sUW0Pf\nypnYZ393eKyhXLFI2W6BYKOnTJMkzv37BFABP+E4UYsTyKc52sWFRalAF7ay\nv+3i\r\n=cL4I\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/mergeConflictMain","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","browser":"./dist/browser/mergeConflictMain","engines":{"vscode":"^1.5.0"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","repository":{"url":"https://github.com/microsoft/vscode.git","type":"git"},"contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","_hasShrinkwrap":false,"readmeFilename":"README.md","activationEvents":["onStartupFinished"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.c0fa3dfd3e2_1616980472522_0.15221747163463717","host":"s3://npm-registry-packages"}},"0.3.0-next.848e3301a18":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.848e3301a18","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.848e3301a18","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"2762f5ed85245cffa4b73e62a2e628fcb99e1766","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.848e3301a18.tgz","fileCount":10,"integrity":"sha512-KWH0N9/Dul42eZOr+SXEflFVGIj+EU8DEDNImRBsSCcC8YhJ7/sK5xyeD5Bujumd+OrskHmvO911hYyj47b6OA==","signatures":[{"sig":"MEUCIBYPnXnHINvbwlnmWjutX5dtPXa/UUoS5sPxGysMaNDMAiEAgfjTYoDw6dl79oCNeu+87Ytz2AbR07/1h/QCBmU7hTM=","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":138752,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.13\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJgYeXVCRA9TVsSAnZWagAAMfwP/j1RscltVrw8MATdBwA6\nqyRemVJI7GFAeSQbiOHXg2V/KiURk25G3fVp09Dvl7oRTnOf8uzswDftCfWP\ncSQckfIaup2A7VbmlhOQBxuEF/I9dH2KQg0ob8KDi6QZmrDaP20yHDt9gsHF\ni/nM7oPAAKwFZQYL7PBgQC7e5c8jHPzvmntHUhIzTZgg1qSbVEMYDHkT2mNf\nS8qedPUSSuJdQiiZsZvoSkE4g6YBLBZU4GsdY+X5a+GimfJSOERDTGBeJ2jL\nCBfgN8WXq7hi56vtcHPR9Ya0/1fSLazsjjXUlKcC/UrrsFqvTptWJRiqWEvT\nmvygYH/dm3QK1n5JcFNausnNGuuMfWn+vuELV/0Jyx6T7IB3CsybH9xbU7L4\nvMreVmEhwRkQVG9usEipNpeooj1JFaYaT5vhGX+ANMM2s70IcXHhvZKnq+eg\nRm+rsDs63fca+FC4yL7fLNevRbDoKDUjy/mkI3RWEa6xX4b4pf3EYy4/7OeB\nvtPajIWdyXhTIZsxRN6Xg22hbmorrpg7nWFIdbLCIFY+0AT0MoASeHUqMlQL\nZP/VcVGIiSJEGvWSzJhvjcQbPWMxblHl7C+ooFXyYPaIgvq6gSuKgkwEaWmg\nmyl6819apXTHpyTMCqnp0hWjGoJTlXvHNUKN5ilm8E+Z2iVE9uL2U64IByTz\nup4e\r\n=W54F\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/mergeConflictMain","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","browser":"./dist/browser/mergeConflictMain","engines":{"vscode":"^1.5.0"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","repository":{"url":"https://github.com/microsoft/vscode.git","type":"git"},"contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","_hasShrinkwrap":false,"readmeFilename":"README.md","activationEvents":["onStartupFinished"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.848e3301a18_1617028565414_0.9440494833230244","host":"s3://npm-registry-packages"}},"0.3.0-next.e09adb28ff4":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.e09adb28ff4","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.e09adb28ff4","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"fe5f84f75630751f9c8ebf125670cf63997dd0de","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.e09adb28ff4.tgz","fileCount":10,"integrity":"sha512-0DLssUJEsQFUyqrbQ10EFI0LcyHSP4+x1fPzUa8BNkf4+32aObja3R1v7jbC20e7YaNf7CLiInsBji4Nxsp8Xg==","signatures":[{"sig":"MEYCIQD0mSyoL25xfppRnhnMIU1iqUnk5nDrieGWxS1nIaxr2gIhAN37STo0ue7AcKFGUehwZ44XJ6UTUaD8rwx9tdnFUDve","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":138752,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.13\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJgYnqoCRA9TVsSAnZWagAAUO8P/j5tfHDxcm9kVDAztM0V\n8dvD6/6Y2++OrWIbRUR2OG7K0vQh+rTUKSRUwt3GjKAZGAzieIBiIl7o4XZP\nwpvPJTt9cSzRjERClddo7m8EMzqx2StW9CVQCql8UZsK6iy3QkAh7jQtzYaL\nEqJZh3B0D8IAXp1yPruMJKzAuwI+Q4873OJ0dG43WgU+HzKde5bevb1HRiRY\nmC2hS+Ua7c3HR2Ng6sm3N0qyXlS51eVEmTfj/ATdvhb0aOua+rt7k7ajrUZ2\nchfEYFmQjkoua1NaadhTyjcgQJ2htjcNow2BLSFLSqn4yb+grwo9OYdG+Ovh\nULHvv/JzgcPKl9xOUy7wXjDLAKx6tKSsym9xkPiVTbfpJqIkEm8qnUeETLF/\n18x+eToIeyexhxi6Hlk2Sb21TA01tMagGSyb9bWB/EX6oSH2PfRio/vrVnh8\ncd3LGVriIM9zyc6EnC/NZtRabG9PXNPWQZ8JSbC7YyYQn0RLNsfD4UTwKuSW\nEYLCjtSm1dDoQ0FDL+TBI+R8XjN58aK8RdJfIH+QKl+RbIWoe1lZ1GbD/wGb\nltJm+ppoOftSVSHiJZZeMNQmi3qjNuyaBJMiLPmbfAi8p1jXGm/Vzo2zFJ8F\n++4o4Jiak06yCgPxUFTxpW3ANQFgtisjrtSogwt6L6UT99Jnec8l3wrVMoVB\nsudr\r\n=4FQw\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/mergeConflictMain","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","browser":"./dist/browser/mergeConflictMain","engines":{"vscode":"^1.5.0"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","repository":{"url":"https://github.com/microsoft/vscode.git","type":"git"},"contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","_hasShrinkwrap":false,"readmeFilename":"README.md","activationEvents":["onStartupFinished"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.e09adb28ff4_1617066663995_0.23178245623832128","host":"s3://npm-registry-packages"}},"0.3.0-next.cd52cd7c8d0":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.cd52cd7c8d0","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.cd52cd7c8d0","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"535edf546580758cde267f9a919a51a78195c733","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.cd52cd7c8d0.tgz","fileCount":10,"integrity":"sha512-3h2oPXigAlLoCLxbxihsnx4jq1aa/uvOBSVPcbQ9rpkl8WlC8zMXQwsI5NdOi3xjcG6Iw1G4wnvYoth9xusF2Q==","signatures":[{"sig":"MEUCIFMmnQecoJR9kgytk27IjT6OA59f66T9Vk8/qMeFK3e7AiEA8nKOTVB00LsjQ79qjqXMX4C8N3JPxcMIqeVxOH5WAqA=","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":138752,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.13\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJgY8umCRA9TVsSAnZWagAAd+gP/RH5tSuSSKnRq3l1aY79\nq8zMbCtu38AWPH9TF/grXB4pMMud9dCHf1h1P95K1YRoJD/Oyuu21hOkBxEM\nVYPlvUtbFZsyO44Dfh9cb84AT7qjMoqKe4JuqwtW9ZQLMuohIepdOfSnisje\nT7ybLH/50vDsRZniuYwz7vRd4TDQsRfHaNwwTTFJmDq7P4VVIcrsy34F6sYw\n9g120ODHTJj60sXEf07pWpb5UxsCpOf9X8nGPtMujvMUcb72APAIKhP2noAz\nJbnVqhI9QOqq5KAm4DwoB4DGJdIDQQD8g+a85YIWSKHJToZGhOH3DBNiYz8T\nOW6HaSQiULD5/YF9aK+CbxgZuO2Tie/hGE/LnC9PdOuAjMa0lPtrnZtNQ1L1\nXmVPT/MBREBgC9cLwNF/YS92F3ILhXqNbMKnurkXLrz227nkkyzSB5DWu+Bl\n9QI0tgblzU87P91Qq9EqZjzjt/dpT3EsqQmb/uXlnhAjrB+gwH3U+gjhvtfo\n3Jl8xqK/avL1XLFhhdOT3Ew37v9gjUvJe1WFpLu/XG+XE6cERjCRUyqJX7RR\nXXwLrwUVnnwzkTPMqVPrJ+9uRagLNAaEr/A/rzeGR3LHJfeFbJMzjSbvwCG9\nVZxJQAneWTBIFc8dbufkBpfEsF0GLtKuXTnUF6vP2kuaTN3lzPWCXME5i7nA\n/H8o\r\n=PBso\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/mergeConflictMain","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","browser":"./dist/browser/mergeConflictMain","engines":{"vscode":"^1.5.0"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","repository":{"url":"https://github.com/microsoft/vscode.git","type":"git"},"contributes":{"menus":{"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","_hasShrinkwrap":false,"readmeFilename":"README.md","activationEvents":["onStartupFinished"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.cd52cd7c8d0_1617152934169_0.8245947936680822","host":"s3://npm-registry-packages"}},"0.3.0-next.3fbe95a1cb5":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.3fbe95a1cb5","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.3fbe95a1cb5","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"5969ada0a943e3b18937ac683710c8bdbd5c1188","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.3fbe95a1cb5.tgz","fileCount":10,"integrity":"sha512-HFUMkxJYMzi8p4v59InafoPcwSG7a3wOVCgfQDD4ATbaRr/WiO7FCs4yxZ0jw7EpsapDUSDJfEA6O4FeAdAylQ==","signatures":[{"sig":"MEUCICoch9be9oUrBC4zTNsNMvYdTFApMZkudxM1fpZ6Mr9cAiEA/H1wddTGAqKKZQqXonIqsBisF8DORNjBczGsEzp61Ww=","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":139761,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.13\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJgZR5HCRA9TVsSAnZWagAAE6AP/iXu/qXnvNxz3lvx54d9\nimji2hCPqfpsnuZRVy3Ap6ulohKg0j19B8jfd6rJMzJrgGrds2/69ORQbaN5\n6e+pl1/j0fd0qNStc0DSsbPbXrSCeC3mjfDGlaVtsFa1M1OWVPR9Ktdp1gCH\najXdCzXiJuLly6jmAdXq5mR6iRsEyv612lz1xBWGq8L+ISi6IxxVxx49A3Lp\nLuXu/IkCC0TNWWPi5O7vMM++/nmhu6bkG/+AKJiEG6OxOpNCAKbAmT5B/MuZ\nnVvsW6VvSeSxM2RhFvogzEYN7vp2CtiMMw0bvuPdwaAQYH6Ac9BVGqyIcoG+\nXJ4wEnYVG5lIGQpBf2M1JzMZbQpC7wF08ff5uWlt2zwAn8egQHm+bwdMtg7h\nB9bICSnkK5rkoCbdCmd3WdMsXnLuSwMzxawFSZ9dA85+88ztlo3Oq4ZM6BWv\nN4YDZCcdfXJKEYxM2P9Fvpr01ctBisO91gNuGf0gLdQMwHK61DipJHNi0LoV\nxn5gdHDqjGgb/Z6JCP4PNetMbb0521XY4vl4/WBPzO5KZnsziy6qQjVwGFPJ\njgj29cImiIroKbuTQe5ebn+kXlaXCX4G5Z6rx4/b7JdddShhvwv86An0gMxu\nypFpgqKyGqhGuwy5UPwO73CC4uGFoit69/YYO3Wvn/Awwh32JPCx0gF8Jzkq\nr0gN\r\n=S5KX\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/mergeConflictMain","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","browser":"./dist/browser/mergeConflictMain","engines":{"vscode":"^1.5.0"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","repository":{"url":"https://github.com/microsoft/vscode.git","type":"git"},"contributes":{"menus":{"editor/title":[{"when":"mergeConflictsCount && mergeConflictsCount != 0","group":"navigation@1","command":"merge-conflict.previous"},{"when":"mergeConflictsCount && mergeConflictsCount != 0","group":"navigation@2","command":"merge-conflict.next"}],"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"icon":"$(arrow-down)","title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"icon":"$(arrow-up)","title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","_hasShrinkwrap":false,"readmeFilename":"README.md","activationEvents":["onStartupFinished"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.3fbe95a1cb5_1617239622388_0.48918425039551683","host":"s3://npm-registry-packages"}},"0.3.0-next.4f46f64b437":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.4f46f64b437","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.4f46f64b437","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"20904f8ede73a546ad96b4431727cd6f7048b2ea","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.4f46f64b437.tgz","fileCount":10,"integrity":"sha512-MjiINa45dKKxeuOerSWc3tUbHIZutzacnsKDV6MApy4+t6qRgDw0gfEsivG2pKKWF8tfvCQjTBgHYafrXzcajg==","signatures":[{"sig":"MEYCIQDp8VLKTQVVy/nMu4tQTskFPA5VciQxeIaqkRM4cpVPAgIhAPgyE771UwyE4plEOtC5GnVO/gHUiD53TZKQ5N5Od7Tr","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":139761,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.13\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJgZnEPCRA9TVsSAnZWagAAQg8P/An81acHIgl5lzUa63/D\n8nwPLlzSp3x9coi01Iw56rcf4FkM+P21A7UH6b8b4JUhIj+PTcOClSmenoh4\nUQB/8ZveFnv0VpQ9vNoEK9XutFtf5wAEEpBgYRDHW952FuiIwmAyNh6TKgzV\nH+GgoEqgwuIuQsRUcogBHg6ki4QDIOhHLoictdKI2K+aM7YZ9Mgco+HPrUpA\n0ggbmc0lJIvKKGS4W/cttcdZ7bOdt3Dq2wUjtfMP1qI0xDZ/QbMYJliurAPV\nn0hvaABpqxjrNiRAV7VaoSj3iGfMSJ2a+SWFx9HUG0ejVE5gOsBCV7KnW1RE\nOYEhPvyRdxPuCce4DqkOnm+Aa48g08STYfeDuuqvIKPPExfVkyymwyafuaRU\nsp7pgll7MfgQqdpEPe+JoyK5tU52SKP29gtYaeFDxZgtLmzxrbAZ0w5TV1Qt\nR9GZcV/a3I7tEsbTR/4B9DFj5PqJK0LrTFskBEkVOKMhjKwPNffdnSALW7iT\nsOyaAKIPltar1aF9WjQYDzy+SmyYlBj2jfZF4gf7qc4Bvmw+gKyFhlBpXIo8\nHJMml6ijVL+aSOqvL3JcAGRlhueiJYFFqzC/gI4DvQr26edR1PZhL5pIZsFu\nTfX+RjfqGEqpi550+TTy2zH73pREET3CNv5GJ7bC/fkjaGkh92Jo6VDOXsQK\nr3q1\r\n=s/wd\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/mergeConflictMain","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","browser":"./dist/browser/mergeConflictMain","engines":{"vscode":"^1.5.0"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","repository":{"url":"https://github.com/microsoft/vscode.git","type":"git"},"contributes":{"menus":{"editor/title":[{"when":"mergeConflictsCount && mergeConflictsCount != 0","group":"navigation@1","command":"merge-conflict.previous"},{"when":"mergeConflictsCount && mergeConflictsCount != 0","group":"navigation@2","command":"merge-conflict.next"}],"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"icon":"$(arrow-down)","title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"icon":"$(arrow-up)","title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","_hasShrinkwrap":false,"readmeFilename":"README.md","activationEvents":["onStartupFinished"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.4f46f64b437_1617326351462_0.2498949723497128","host":"s3://npm-registry-packages"}},"0.3.0-next.96eaf9dd9b8":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.96eaf9dd9b8","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.96eaf9dd9b8","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"085316037e27500ad29e0f2855c8a1653ca7f46e","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.96eaf9dd9b8.tgz","fileCount":10,"integrity":"sha512-mMcG9rWuCiWN0lB9lidNh8RqGsUQQ3Hr4KoiuIYod11gWNv06G5rsJuiaZbJ18RRVpecvlgb0jxi3njYmTHg7g==","signatures":[{"sig":"MEYCIQCuI/OPeuE2qEwvNzlnaG10R/cPTzhtOsNjoohJBRL+GgIhALyXfVx7sIGO1QwJ23/jnMxzk2Xh23NV2ldaV6WgmAG5","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":139761,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.13\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJgZ8EgCRA9TVsSAnZWagAACmYP/jTa0cmh35nMbMk8GQe5\nRvUzD1kJknTr9qJKaDIhQfw8xYTAeJbQVzoLlrCPHQWAcAUnhq1WW5y/qg3K\nYce0H9Ki3aCgN/2IE+MlXsulN6yRxcQh7jk2p1C/2tVFSF1U0HX3n1Vj05nc\nhUGbZ6tT3+9S8t2lsqmLnnWsYWWfPTAXiQV0AOYaU1pMrBLjLAb8lXrn7Pqe\niNZZ4/7KA4FsEVlZeG8hKcpQeWAmuQRMRQwBD5Wyzn4YAc6QcVwaanx3xFVd\nRkAaYATdk0tATk0CliN1kSQ8qpYIS1p56ySyANuxJwRL5Jm5eeyW1kL4JfUk\nWjHVvKNIy4KXWErUo78J7tZ1vbBWC5bGfGrgOecwibGvTCSHz1odyrimQ+6B\nKmgbdf0whrWRg+ehD8QWTs7TWYigXao5lcN+JguiWJaSumZiPQb6DCdgGI7I\nO5xspjSiL0BWxI/T3y8SYY2yiwkAt4F4B7wnFxYXKhnA02EHVe7O4fK4ewV0\n+ovSm1tDO+JxnfOruCZMGcjN2gR62yZ4C4ncwJDbhO/34OEPVk+s7F9zAyKe\nsuC41p9oX4Wh/fafegNkmlWLYKdL+S/8hlrhBCnTxAMch1W7LaNi8R3X/gbH\nvMjJrnrTlKOZ9H26dDepza10xMG5sNkPy814wA+k2+4cbNXRk1IZtW2X1xZa\nla5C\r\n=UJ2p\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/mergeConflictMain","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","browser":"./dist/browser/mergeConflictMain","engines":{"vscode":"^1.5.0"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","repository":{"url":"https://github.com/microsoft/vscode.git","type":"git"},"contributes":{"menus":{"editor/title":[{"when":"mergeConflictsCount && mergeConflictsCount != 0","group":"navigation@1","command":"merge-conflict.previous"},{"when":"mergeConflictsCount && mergeConflictsCount != 0","group":"navigation@2","command":"merge-conflict.next"}],"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"icon":"$(arrow-down)","title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"icon":"$(arrow-up)","title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","_hasShrinkwrap":false,"readmeFilename":"README.md","activationEvents":["onStartupFinished"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.96eaf9dd9b8_1617412384407_0.9677012314424172","host":"s3://npm-registry-packages"}},"0.3.0-next.874d19930e3":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.874d19930e3","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.874d19930e3","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"510f69c9efe5f983c68ad9470062e34d5f9cbf18","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.874d19930e3.tgz","fileCount":10,"integrity":"sha512-Vrm2wqMzytRaKFyefY6iNYXErGyTvpoTjE5xyMyU6/4e+LTbzF5E+BXeAU9cHk1crGuO5MTXyCrBGSQbEPb2Bg==","signatures":[{"sig":"MEYCIQDb/6hkP87TQp+gTwvd/2DXNyT47j2HYSt9XvCmIjc6mQIhAIwLbVbQFBT+ArzFkcVfV8JV+n8xHjfbiqWzk43Mbd6S","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":139761,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.13\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJgaRLbCRA9TVsSAnZWagAAhTwP/0BA/ij9W5PlojYLQYFs\nfJcBtnwfLZRyozzf9PwGtpp+syHyVNJA/lR3cjrjX6NnteQExUEeAIU1zzcc\nABVvThoFxSARbI0LgquriXQIpDRT3YJZBsmHjBXivlhXIqbXHpm/2x1KKZ22\nHlvHPFVZq92y+ws+GVqnDtdPZtoTTcjnn+rLBNPbq/SVvBjsUJnx7zwpdh5F\nkb2QGhuPNbHZNAwYBMr3j80hzaYtvwq4j/S1vP0uQd5sMQ9OJKayU4bki72h\nJ/I2vLZlXaaBquJhNYJJZcNUkCSbahGCOM//xtU5pGD68QIAhJA+3zvNieAs\niek4lKrsVE/+qjkinSJz5KalSV5lhlqkzwAKMBZ/ZmCmkGeUeh5wdV1Aizeo\nKKvEQ+ddENCWtpGFX7sA3o/FxBXPTrswqWHEwQ3BjIiI9VXO0BZPv+NJTIRv\njvJ9MkHgMUCBZxE3QiCmz7xDnXuxOU7EvjYTALH95g/7fuLQB6HRYFHLMXpl\nvNdFggIrgPQa5jTdeadBKTN9nfphu789yTZJBQO+2urb26P3NiWNYaU8eAx9\nj3ezgQEUipF3KaVB9OeDKunJhtwrTR6PlHS/d5VBtCn8lniYzekjH0fM93E2\n08t/5kl3JsUC8nKVbcFsP8ti4Z4572gDtbELSDuLjfXLdDIfcDbhsB0byuHJ\nBRaN\r\n=3cA5\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/mergeConflictMain","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","browser":"./dist/browser/mergeConflictMain","engines":{"vscode":"^1.5.0"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","repository":{"url":"https://github.com/microsoft/vscode.git","type":"git"},"contributes":{"menus":{"editor/title":[{"when":"mergeConflictsCount && mergeConflictsCount != 0","group":"navigation@1","command":"merge-conflict.previous"},{"when":"mergeConflictsCount && mergeConflictsCount != 0","group":"navigation@2","command":"merge-conflict.next"}],"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"icon":"$(arrow-down)","title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"icon":"$(arrow-up)","title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","_hasShrinkwrap":false,"readmeFilename":"README.md","activationEvents":["onStartupFinished"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.874d19930e3_1617498843455_0.5010614698310554","host":"s3://npm-registry-packages"}},"0.3.0-next.6d55039842d":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.6d55039842d","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.6d55039842d","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"9677f1a3a303f4bdaad44e41c5473d4a93c77589","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.6d55039842d.tgz","fileCount":10,"integrity":"sha512-qpuuk6iVoFQ3SibVga4evPdgoD2eQXOVt3lFZWVCOF+1BLy20PvQsuCDmhvgLpE/60e9TY7MGHy5MPvnE7i+gQ==","signatures":[{"sig":"MEQCIBVMYdJUtsD5W4TAEV6lcu3vemfjrpvCF97Q7956QY+AAiBq+IPX1WuzAf3M7ZRiLgPeaUT6+ipBTcaAXfNU5IW4Kw==","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":139761,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.13\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJga7YYCRA9TVsSAnZWagAATEgP/3YigmTXmzIfvIS9wcqF\nSoDVvrdqn7I3gXArWTywDaDhKcmneEP7rYfKzxFvgu7tnDXUn3Tkr7w9Z1rO\n6ewCE9SWT5BQ8CgTfV/QCUu7FcOw24gwFjgJiAdDkg4lhheAdlR2w4tzChHc\nqTuC0k5sQyJYCbvG9ll6Z7ldzhpH0jhJatszyIvZ2NOTZX9lQu/TVobWDCAH\nUQUwLEVLFPNTEz6U27CqYk91PhSSC0gGDSaOMgBN8b015gO3RmlvcIVrKuG/\nuo67LNXbO6q9HXfK0/JNGT0xlEguZ/IBzv7JBykN42RhBRpnj5Pmi7zN5W/1\njw4srTwriS8fc+2Wfgs+fx1Mli0slwiuw4preImSaKtsc7NtB5i3RTFTIh5q\naztDyeUryQWcg8wBkHL7/ow2EX1qJ0WTRTc1UG0r8qDBt0RSKW+WOSOX5520\n5vv7ZXCyCUYILFZNOQY1ZOYLAbQiag3SrmdaLovGlZvvFEKG6G2KNzEmXSVw\nTbDn4u085gISJYAAZHpY7X32tRX46gR2gvdHKR6UJVIfIMt7scdaVyihSkOr\nOaeyQ1cbQJOn6M7SGFT37RcF3XhbY405Q2+S52jAzMRBTDEDaoaBX2V7WGN5\njA75SWvJFnsx3mr/oLCVvSMMg5tuiMcFBZE7jp05Rf/tbsqUIgxbeTEj0TVp\n7Wo2\r\n=pKFy\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/mergeConflictMain","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","browser":"./dist/browser/mergeConflictMain","engines":{"vscode":"^1.5.0"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","repository":{"url":"https://github.com/microsoft/vscode.git","type":"git"},"contributes":{"menus":{"editor/title":[{"when":"mergeConflictsCount && mergeConflictsCount != 0","group":"navigation@1","command":"merge-conflict.previous"},{"when":"mergeConflictsCount && mergeConflictsCount != 0","group":"navigation@2","command":"merge-conflict.next"}],"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"icon":"$(arrow-down)","title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"icon":"$(arrow-up)","title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","_hasShrinkwrap":false,"readmeFilename":"README.md","activationEvents":["onStartupFinished"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.6d55039842d_1617671704043_0.5748710840401408","host":"s3://npm-registry-packages"}},"0.3.0-next.28a246d9ec5":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.28a246d9ec5","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.28a246d9ec5","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"1ba51fc3a41fe9b7e70a65947f4e2792d3b7a56c","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.28a246d9ec5.tgz","fileCount":10,"integrity":"sha512-8AY7wwEjR7y4XVspHLTAZECOCnVi8ENVPFReuGPcxNqUF3+8QuY/LYSaibKCrNarcbKWCsqxAhFaoldNhsoQRw==","signatures":[{"sig":"MEUCIQDinYGbtQcL/MGuieNd/MwHczXCOa2CfcR7q35gJS0lxQIgTy3PGSKC1JRYH/jgTZTOo4M9JxKEPeMXUnuza8aSVGQ=","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":139761,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.13\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJgbQbkCRA9TVsSAnZWagAAuf8P/iJetl/UwM2ciBGJJBy6\nChgP8C9MKBSmxUrb8KyIn59hkEWxbAev7ISfqZTVEIxJXnWfy+Youi4KKe3F\nAhs7RC8uKc4ey9q3EeUjt/+Pr56EEOU4wvpCDjcOhea+b2SQyzoOSVBf9omt\nCTAMk0VSJ6hpqMU1HzOCqS8ufSmYAVhr2HwgEV+vYJI/UWjr3e7++pjdxl8l\ngKzwiPKowZPYvgy4dsMo5q1KhhjpBTkYQORFgjX1MnB38h+GUgRPlbOvdXCL\nUy8bCoaHM5spIRo7UpmN+katc1k388eDep3g3//KpA46HIdRyMOy1az9ncq7\nlRl9OkXnPhBommB+7KKaIEwINi6Eh/NIhNO8sz9ty1iw584N/YVvRDwk0289\nUS3Lg1FmfY3Kw6vKB47szgi5kFtbFNeS2+h5EhY/XcF5Yc5JeDSRueosRKEU\nBxL/B65U3U4FEzF7rB5Yuch0EmjQbMwSf4aU1mkiIjdwR8ldk04V8ookEbWu\nbku8Pm8nRaCoRiqxfygEKunG4fvL/pVZ1h9l+eXkt70aQUEBsgySAF5qbino\nIrTtUM7W2KFQl19rwiK4xuNOVVYLO8+npBZDDfxzihzNgM5PJA6nDD+3BjE6\nOCPIJdwGEb5gFnB5VG8DeBUmjUKL3iv2pc4zXheNoMONcR0SVCz8lE622sfJ\n7YZC\r\n=qc80\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/mergeConflictMain","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","browser":"./dist/browser/mergeConflictMain","engines":{"vscode":"^1.5.0"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","repository":{"url":"https://github.com/microsoft/vscode.git","type":"git"},"contributes":{"menus":{"editor/title":[{"when":"mergeConflictsCount && mergeConflictsCount != 0","group":"navigation@1","command":"merge-conflict.previous"},{"when":"mergeConflictsCount && mergeConflictsCount != 0","group":"navigation@2","command":"merge-conflict.next"}],"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"icon":"$(arrow-down)","title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"icon":"$(arrow-up)","title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","_hasShrinkwrap":false,"readmeFilename":"README.md","activationEvents":["onStartupFinished"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.28a246d9ec5_1617757924461_0.11031656013534796","host":"s3://npm-registry-packages"}},"0.3.0-next.5207b984029":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.5207b984029","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.5207b984029","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"3da80bd81ee46c2abe7fc31fae939ffd6bcf4443","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.5207b984029.tgz","fileCount":10,"integrity":"sha512-umlvbwI45rW4n/VGvbQqCLpvT/oV+y/ktTj/JNln3fmBEWXFT4M2/8ZSAk7rZpe+7R28NDMN5pmj/P49UfFI8w==","signatures":[{"sig":"MEYCIQC0uwdDDGwI4pm87gqg/4qjd3MD0aypwUQa/ccaettBvQIhAMRIoZJZ4GjXtmKcApqhXe75TLQ2SR+hC2MiosVuk/e0","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":139761,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.13\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJgbllXCRA9TVsSAnZWagAA2DUP/AqFvygtsRxo3igk4G1q\nEqflatCek4GCN4ELkH7X6k2EAJUx9b26fnPAzE3HmDFrPq/8Bi+0T1oqritr\n6VPEbkPF86Jsb6T4dCMWuwKyGUfn04UH7aPKeEv2aTu9jCgDTtKOXFYxd3jp\nmjOil1FLgs3hfSMZsOoa/K0GhMwV/5w1hBvLQFBKbuHNr8nsm3tcGUWM+3u7\nG/0OJphGxWTW3K2s3ZYJgU2SfeD826vEO8omFEJAXjw2R58kDOAnQTcsgyjc\n2eIj7gYMqqnZfeKqbfHxTBQC5rCJP8MEMF1NX3sKtRmw4Q1/JtOkqMH4Fb1L\nbDeCafO0t299wglNwsirSks7Vx09/uQAYs4ZQ52qfHj1pNBbiC8X5ukwl4eB\nVWC1LQgvCWTfmSLr5cBpym/R2xXX90qZhCgbG+e5O9fSA6mKOX9R7I2b/vyX\nHAhec6UqVQ8R8WciZ+RpG5GxrRyvIuheqrxLIxLBWBxx41HqWGMwwFtZwD5Z\nBYMOLcpR25SRoqqupwvAeA7yjx4pwEe3Je/xefiX4+ZaOMr2x8IP6T6JkTCH\nklvMRU/4Q1kPCwlF+K3y3+tnO349Exn/VmvGOfj/P3cSkFVeLLEp+SERgt5F\nyfqwXdzLWNF8Z4fXBSJl6yz3xNX2J+O61O8sWVEg0AArz3m10wajGQLSMzoB\nz3VH\r\n=E+Hv\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/mergeConflictMain","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","browser":"./dist/browser/mergeConflictMain","engines":{"vscode":"^1.5.0"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","repository":{"url":"https://github.com/microsoft/vscode.git","type":"git"},"contributes":{"menus":{"editor/title":[{"when":"mergeConflictsCount && mergeConflictsCount != 0","group":"navigation@1","command":"merge-conflict.previous"},{"when":"mergeConflictsCount && mergeConflictsCount != 0","group":"navigation@2","command":"merge-conflict.next"}],"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"icon":"$(arrow-down)","title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"icon":"$(arrow-up)","title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","_hasShrinkwrap":false,"readmeFilename":"README.md","activationEvents":["onStartupFinished"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.5207b984029_1617844566778_0.9616323496238295","host":"s3://npm-registry-packages"}},"0.3.0-next.2d7ddf5a381":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.2d7ddf5a381","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.2d7ddf5a381","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"b6e3cea148a109ba0735a12f23c68820a4de65de","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.2d7ddf5a381.tgz","fileCount":10,"integrity":"sha512-VIajUWHSHmjtjC7dk01cR/icnGWLnjwciOL18QNOzS+U1S/AHc+AwV8YwcMUJTSJRVUShqON8ljrMekzaQbUOA==","signatures":[{"sig":"MEUCIDQyNwnV6mnNKB9WVaCliNsLw2+v/bUeMfGTMr9VQEqTAiEAtbA4ZC4RZnjKqXjiZXQtoV1s2nSICj7LFvFHk/sby7E=","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":139761,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.13\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJgb6n6CRA9TVsSAnZWagAAueoP/A1SULQTwjk3vBGi71M2\nagyRAc9Q1LW5uxAIYzrdpz2aJ1xlTHP2XBrLyo7vruIH8B2YcOao76VGx8B0\nUXGoTDy5HFuEWdZo4Lwqh/wxeWqaQ0GVXp9crKnz3rh7iefcYLE2ys3QPBxm\n2lT+Zrd1A5wUjbzeYoIi7Tj+1PhwoI5Rn5xEfzuGdj67hVQsi0eP/UTXRgyZ\ntZx+l2lltxIWoEBKdsFnUdSzt5qlSeatbz3+FCupQt3DqgKswammXY0ycgOX\nSY9ifWWy1UJBVbQ0l73CiAUb+D7SMjSLM2whV0sSq8wk/5QcV477mhR3Vjy3\nconsF12Tq1qp0iu23Us1mvMbLdn/y0CzXOgZmV7WeaGn15fl+ipscqByrcF9\nnYx2mItqArW+MF09Z6y7PQEBXzfnjfwoqpSa6MDpVp20kBRAB0H2l7ce+mgX\nOCEXlI5TJ8B+kXMVHqNYJUBet8ijIA20V1OZfREuJfJgl1vedqLjqHKLb4I3\nit7WO3ag1fjBEfbhynAV3EEFb/RTqp1kpTV2y17ogLuixqlEshXjWA5EC7iU\nC319Y/XxietvOJ/7zOA2+2DSAIzY5KrNcYCap8Bv4F3q8IMYEmlE3ZHXenrG\nkFtYVd9phRLmqyeflDL3Ng0BgCjjgtg55Uo71LkoxunRi/1tlv5yZ6Y8uqnP\n+ob4\r\n=UZ5K\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/mergeConflictMain","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","browser":"./dist/browser/mergeConflictMain","engines":{"vscode":"^1.5.0"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","repository":{"url":"https://github.com/microsoft/vscode.git","type":"git"},"contributes":{"menus":{"editor/title":[{"when":"mergeConflictsCount && mergeConflictsCount != 0","group":"navigation@1","command":"merge-conflict.previous"},{"when":"mergeConflictsCount && mergeConflictsCount != 0","group":"navigation@2","command":"merge-conflict.next"}],"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"icon":"$(arrow-down)","title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"icon":"$(arrow-up)","title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","_hasShrinkwrap":false,"readmeFilename":"README.md","activationEvents":["onStartupFinished"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.2d7ddf5a381_1617930745997_0.7980741881606677","host":"s3://npm-registry-packages"}},"0.3.0-next.a5af80b4bc9":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.a5af80b4bc9","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.a5af80b4bc9","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"14dbcafaa3916075668897611e3f750641bb58ee","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.a5af80b4bc9.tgz","fileCount":10,"integrity":"sha512-A4c/PbgxO1uCe5eEwarLZay7KAN2ipcVTJnGGJr8kM/eCE4Hb7HiKowIpin9BJSvd3CwC5+lhvL12qmfR23N0w==","signatures":[{"sig":"MEYCIQDm2ZZH1oOwR+676a/kHK02liYVjlWDqNnuPlgmm+0zkgIhAOJxfPYfPvtJIEVPmMDbXlfuWOggywgcbSmvJ6de28iY","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":139761,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.13\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJgcPtUCRA9TVsSAnZWagAAiogP/3sYFnp6GeHeIN+mMu5+\nn3brnvAfIdAI0qDEJgQV1pIMEGSbJ2ptkCaJPpsxHImBeyJ0GPJdHyNjFpqv\nISYlld8zvYs6v6bnBfMzMmxe64bfy9zYpbvs/U4Lp7xE/bFQRY4WU70tsGCh\n+wvrwTEQfAluh+reZq7LLIqgOsJkVLIJ6nNkcOjVL6+6nQrJkFBvAjLcL7il\nvAV2+V8lZbOo+G3Pfc6EOvDLyAW3rASNeYvn/SfOgwHMGewExjsCQX60Q+Jg\ncn2OTPZK0QZ9nT/Cc0itKJ/IhFRJA7E+N4+yAz2TToEJbUIUGaBPmIjaHp7/\nAsZjkSP9PiivRqaVHCF4pZfj9ADbLXg0nESWXbsalcrTtQKU3oowUMkdn1Cn\nqkrGroK4hzXuy/sCtn1sesVEEqSwdqTKHTluKID3UxTDamDlmDJKGxSdAnZX\npWDdVk4NikLdgVrOfnG0bHLwbz++E0S3qKjuJLSRqv+QcihDJz8dallVQSTE\nIWN537sblApA2jnsOCOWG+6H905sFqctzPO2RFCaaes4R8XdayVVlgHbtCAZ\n/ro31Km687WSkBKMsyafkQ5GneNBINzQ68zgD+RoRxAGZsRgp+nhq21vaj6D\nUBpH7I9SWPHL54xs+4u0agQ3b49vnipW3wDAXPnhcRwgAhCcXblOwy2ykTom\njnMi\r\n=rv7G\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/mergeConflictMain","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","browser":"./dist/browser/mergeConflictMain","engines":{"vscode":"^1.5.0"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","repository":{"url":"https://github.com/microsoft/vscode.git","type":"git"},"contributes":{"menus":{"editor/title":[{"when":"mergeConflictsCount && mergeConflictsCount != 0","group":"navigation@1","command":"merge-conflict.previous"},{"when":"mergeConflictsCount && mergeConflictsCount != 0","group":"navigation@2","command":"merge-conflict.next"}],"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"icon":"$(arrow-down)","title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"icon":"$(arrow-up)","title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","_hasShrinkwrap":false,"readmeFilename":"README.md","activationEvents":["onStartupFinished"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.a5af80b4bc9_1618017107830_0.44247006549492496","host":"s3://npm-registry-packages"}},"0.3.0-next.01466cf692c":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.01466cf692c","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.01466cf692c","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"eed92f46762577e99501b4887b7297ceda4e6c5a","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.01466cf692c.tgz","fileCount":10,"integrity":"sha512-KWxzwN9kN5AoaxAHb/lGOWHB8RF7+FOQVoRt5MTDmh5ufbIFwg5PZ+ySEpbUDS2gfNprZ7Pw/MW3U6eYOMyOjg==","signatures":[{"sig":"MEYCIQCyuIrgA8I265aqsyrtBRd5ItYxdRdPUq8Tlsh7ZF3TugIhAIRtmg+JyN8fXYIuEODtY85X1RPmvN1HYJjS6DFeII0g","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":139761,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.13\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJgck4yCRA9TVsSAnZWagAAbTgP/0yma1RmqThHmvErHBPe\n2PCq89Vyt8VeH2aN85EQ+xbx5kv3XrSEJFRauowGK4PtZGRMetzEIsbwldYh\n+v/9+5LUorBcoPcIp2hLCfyCHBszEuta+iC7iKxfS5zRh6oR0eR5q6+ar48c\nejXKvYXoPsxVHjH1ZDClOYvowk9QlOiJ53d68TgIIrgf8FKJZMOjYANW2ln6\n/1Ey1UpltqjeLjoG4LiCsnuAz+kOWdZJoyNixu0puiubKjVU3riqjUCwzlp6\n9YCs79eAc8RzyDjWO8VbYJpobb/ZynoX1rieLss1XLV8yiN2842XB6mHhDwT\n9fs3PHd8qiq6qYvowBajB8yjSmJXWPKd59EC+p4+slgIIqWI5CgVa/AEm4V8\nfqt2++t4d5QpxoOAedxNoyHnLjUn3+dveKWTy+J89KLOJ7yrn3gNQj0RgVZ3\nNsnjuuIA11pDJmBfCE/3dvGgZ1D78AwfniiHc54w1anwch1scP41rIy0SWOG\nxiTRH96Slgd/eR9DAba4Q2zC6/ifqgxP8P4Y7Kee6xJUKtpkKX61B1yA2u5U\nTCp1XXUUllZGzhFSFtu0oq/WbmHh/W3FaEnNaj21u8HQQOinEJ+tAaCQVnfc\nQ1zuRSrWmxOedteJBwC3zdgAYaOkJLAprEKGCxsnMWtFSbCG72oZpgfq8SwI\nqE5H\r\n=4yai\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/mergeConflictMain","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","browser":"./dist/browser/mergeConflictMain","engines":{"vscode":"^1.5.0"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","repository":{"url":"https://github.com/microsoft/vscode.git","type":"git"},"contributes":{"menus":{"editor/title":[{"when":"mergeConflictsCount && mergeConflictsCount != 0","group":"navigation@1","command":"merge-conflict.previous"},{"when":"mergeConflictsCount && mergeConflictsCount != 0","group":"navigation@2","command":"merge-conflict.next"}],"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"icon":"$(arrow-down)","title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"icon":"$(arrow-up)","title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","_hasShrinkwrap":false,"readmeFilename":"README.md","activationEvents":["onStartupFinished"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.01466cf692c_1618103857683_0.9513920570956595","host":"s3://npm-registry-packages"}},"0.3.0-next.eac3821fbf9":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.eac3821fbf9","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.eac3821fbf9","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"6d8698f86dfaa1209e7ac2d538b0faacbb7b63a4","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.eac3821fbf9.tgz","fileCount":10,"integrity":"sha512-tL5mwxVh6oYLUfRsuJAD9Cn2Ndxd7/UmxJL/HbW5LDyGL24bLHwdTCc9qO8L5HX44wlxDCgPSWy4TPAI5Zm14A==","signatures":[{"sig":"MEYCIQCkMEuvAcyiP9h80c4LEPNaIMuvw0VYezAB496lbfY0AAIhANwkn9iuslOpy6V6knbQbTuHCd+Ev7husqroeHaXBz/t","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":139761,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.13\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJgdPDeCRA9TVsSAnZWagAA/oQP/1G9uCnuxcrsSlGHm7A6\n+bXfuB7nPpZj93B9Zk7NDPqhMTgHFQpQpmall10eVSHRhQv3mZmZen4SBHZX\nsC0GCpi+gB3+wna+Se3V8LcqXCESG82EZvgMv1pCDkq9VPGGR+11uAQgHhQb\np/fBqdQX8WxuWrXtJAGHL4Non+VGVWfKOKSv1DRqEU2M33uJXiB5y9j0l3IT\n6INj/cg5cTJVnNuoNBUVCSHhF6wCYiHfhcJIqbtqGh7T52+6U4fsyhSCTpDy\n0KPX56SdSOvOQMpq4RBkTkmye3sTZlmsLWCqvfqZdGIAY91QpgLEJvg+ngUC\nBI7QY3VV1PzfAK1cQwcWtkhJm1cRMnnWJG6Q3xiprUHDIJ0+3shwrJG9iRDp\nD0AuT6armtX+ci1zNskOBt6CvF/Xak6rKL5EA74yAByzmffFXI9DXM6pS/O/\nHV9M+rtMsutzcmE5h19FZDPdxbcGNbMYrkCDLQETC6UMyW8t/19rHchu3U9Y\n25AtlNtP7oE+cgASW+ZJe7oy31Y4/q0f6Kp8vPa0W+BtNw30sIestl/j7/1y\nNbdn/MRh5iURDyeUnAZIqbpFwKbj34rxnRXLdl9FgMet72UkrZ3pbgKcp1VE\n0uQ5eIJdPoBh5hIPkfuMs37aG8hT292FFeNhuYH+ID4twxjk7Ivs87p5WagG\ncGkl\r\n=qXrK\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/mergeConflictMain","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","browser":"./dist/browser/mergeConflictMain","engines":{"vscode":"^1.5.0"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","repository":{"url":"https://github.com/microsoft/vscode.git","type":"git"},"contributes":{"menus":{"editor/title":[{"when":"mergeConflictsCount && mergeConflictsCount != 0","group":"navigation@1","command":"merge-conflict.previous"},{"when":"mergeConflictsCount && mergeConflictsCount != 0","group":"navigation@2","command":"merge-conflict.next"}],"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"icon":"$(arrow-down)","title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"icon":"$(arrow-up)","title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","_hasShrinkwrap":false,"readmeFilename":"README.md","activationEvents":["onStartupFinished"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.eac3821fbf9_1618276573715_0.6680121430588868","host":"s3://npm-registry-packages"}},"0.3.0-next.4ffd6a8d742":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.4ffd6a8d742","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.4ffd6a8d742","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"4cd6abb5a428d09f8e3cc83658bca9dc42c0ad06","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.4ffd6a8d742.tgz","fileCount":10,"integrity":"sha512-Z4HqvN3p235Ue7uWfXzHkRRgUKw1vKtqgZRHG0aBuENtYWTuTvW2B4GJkR9D2Vt3+nzdq96mQqlVQPBSXvI/5g==","signatures":[{"sig":"MEQCIHeBIezfndEIqodISqDc3evhMv1Zy5muN2e/2Y6m+c8eAiBC0TgNIm+dE1UnqE3g89+GlEOGNZB5yRojGmRsIjWcEA==","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":139811,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.13\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJgdkEGCRA9TVsSAnZWagAA+eIP/RRsQ0ksQTb4/2+u6pIc\nBBWwJs/Ipl6kLXclkuVhDuJXQv9MwTQbXKRjlfSCccppLBth04avXgYP4E94\nT0zFhY4hKhCvPrpw/1fqn0BgtU0g8wuIHKKIIv+MH+KrzTYByUbOZ2LqQKE8\nmzRRGrdJKdYqxjWeBNK/Uz+I6DaXKKQHj44/pTKhWRDrX71xZtCV5F6vbLEN\nvNfCvhh+7RlLh7avgaM9FDWBgwI4BKxs8SFIT6i1PoD/Cn+AWLRT/SOS6s/u\n/GFzoxQHoeF2rkrOmgXQCzaYx0O3NBBs6dUyjpkZHkhPv9mF4j8ZJ8afkr+9\nr+w5+pkk1EUNif0xHnl8s8LI3q/sbt7BfIJj1kKkuZN9iq21btZNimiQtpsY\nzVtIlGH+PbJAClz5gYfgT5jqxhgA82O62E9MBoKxc177M+fThHACDnSi6u4n\n4SD+X9IJ6BKZ1xlRL0koSgJB5qAwx4ygQ1ZatwgqNqi2o2iQcxveTGuTaEQb\n5oPcuMRsNrp9P+0YKdsX1tfKzn6SeJu4OSAktCoPWK71KYIkPLkE3FELmzBr\nycH4pEWnneoAy5KJ0MLP0/IJP4w9Jl6uNJ+HdgFuAeqbXR4Lq75CNvJYhcNU\nTKoZ+Jo+sb22rUc3WrQ9LBp9QuvUPk0YnW1jSyKbzhUd+A8TVE/hehg+BNYw\nj5t/\r\n=ahOF\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/mergeConflictMain","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","browser":"./dist/browser/mergeConflictMain","engines":{"vscode":"^1.5.0"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","repository":{"url":"https://github.com/microsoft/vscode.git","type":"git"},"contributes":{"menus":{"editor/title":[{"when":"mergeConflictsCount && mergeConflictsCount != 0","group":"navigation@1","command":"merge-conflict.previous"},{"when":"mergeConflictsCount && mergeConflictsCount != 0","group":"navigation@2","command":"merge-conflict.next"}],"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"icon":"$(arrow-down)","title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"icon":"$(arrow-up)","title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","_hasShrinkwrap":false,"readmeFilename":"README.md","workspaceTrust":{"request":"never"},"activationEvents":["onStartupFinished"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.4ffd6a8d742_1618362630072_0.12043949663945197","host":"s3://npm-registry-packages"}},"0.3.0-next.0a6309be1ee":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.0a6309be1ee","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.0a6309be1ee","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"da762f5375a64ae38bb645b76cee39693d7235e4","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.0a6309be1ee.tgz","fileCount":10,"integrity":"sha512-fb4+fOZZIJlIUjdXyTE0Nf+YKxOgCzUxwA30CiZbmm7m6eLSolvBJTCTjBhiuxoWoYmq3fVrKLgO1WavZATnzA==","signatures":[{"sig":"MEQCIAI5ko3Dgcin/Q5Zdo9I4Ko5wUWOFgnIj8vj/G10sdjlAiBd8FiUaxZPjwnJAs1gSZ4SA1RxsxmBHcCL5VBMaBLTiQ==","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":139811,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.13\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJgd5MZCRA9TVsSAnZWagAApi8P/0rFo95qYIv0mgiEe+h2\nWWOkVnTMHMHYtdYgGoBWK9HgcuE+gjUSOzT+u3aVO3i8jvNNNMC2iK4ReP68\n58HBac2M6q7Hp55b/IybF+ujgKINq2zPpGVjS5k8xhUYsOgUfLaHhFM9Xpoe\nPb8//QQCs69Op0dVelNDmXEl5uq1045LF5bscYIJQdxoyFQoIFvVwHU/m+wg\neprZ2Fmf61lWRrMKhgjAMKNDq/nZk5CWm0ifuR5Dr+vSmOPVoHofSMEOlFdk\nkeq4eh11GbbFW5Ab/LMRewjW026odvD0HX+fK0V8ay8MweeVDs04UJyx5x7e\nDV3RkKirv3/50kYRuIgnas64ZrbvuqN+SvAv/kUsf4alBuA56umo7VWLeywu\nn/qXO6wIHyzRTSJiuPzhTWILGccYxqNcOsz7W6YEJjZE0Gii6XGv0u9114r9\nJDE6bVjcEAlTLmG/kIDSMSBVZ7WRHUNNdYgIhYZMRs1pICNHA7ejDJRCUaqe\nL5sRe/RIoQzulzVnVVrFfqqn8xKSsdxsZb+WaVSPLY/g8vrmuoV4BL86h6qL\nGlPjTxDvg3Vt+gioxSkqHvydFGHfWgDJ70IqktrM+lajZo5PP6QT0CYx1/Pq\nU5YWKMIgPhCfLwjVJVdlJBNtMcDpj8naXqxD3u7Ze/JcqTYFacpgqyAbGGqI\n+aWr\r\n=XrEM\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/mergeConflictMain","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","browser":"./dist/browser/mergeConflictMain","engines":{"vscode":"^1.5.0"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","repository":{"url":"https://github.com/microsoft/vscode.git","type":"git"},"contributes":{"menus":{"editor/title":[{"when":"mergeConflictsCount && mergeConflictsCount != 0","group":"navigation@1","command":"merge-conflict.previous"},{"when":"mergeConflictsCount && mergeConflictsCount != 0","group":"navigation@2","command":"merge-conflict.next"}],"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"icon":"$(arrow-down)","title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"icon":"$(arrow-up)","title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","_hasShrinkwrap":false,"readmeFilename":"README.md","workspaceTrust":{"request":"never"},"activationEvents":["onStartupFinished"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.0a6309be1ee_1618449177249_0.2748391782148374","host":"s3://npm-registry-packages"}},"0.3.0-next.402c9bee093":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.402c9bee093","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.402c9bee093","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"9ae0b6519885a6d9d6a9b42aaff8cfaa8bb82316","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.402c9bee093.tgz","fileCount":10,"integrity":"sha512-fy6IdCov7dBOMjfeAntSS/cA0Sz6ozmTWIGdIttYX7nYvu5AWuwMroANT9Xc0OP9vXRXfCUTfjBjOXxhe717HQ==","signatures":[{"sig":"MEQCICafBS9Orh7gUNRWyQnTB/aiNwLvT4SjYFr9fjyLtk6MAiBHLRgkLBc31y29cP1JNvt8hP0mUfjXUMTYIWqhyK20VQ==","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":139811,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.13\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJgeORmCRA9TVsSAnZWagAA5REQAJEEPUrw9667t3KuH//C\n7TmRjyR1gzWn2G1QZ/iidHlBgtXZeEjj+PYSXsqNCZcE+h1ffDdb9ZDSfYMU\nztOKEZsnxT4AyPNt0yT1rsqs/bcsZIRwl/iRwIcDVuWz0Mmt1rPCtI3jicsE\nkCEuEHsMpL2VEfRlUSfLZGQ0JxcCTM7VDJ/P0xoHzeEBh/7foxbVC/p3smfb\nvtvqciBrOFufJBy95+oh3P6rKowCasVZzf0CqCq3lfTisHAl71a606qu7ank\nuh4R0TmVcJiWLGuddmamBLW85xtBvnHS88JqlCsx8NUb18VynIY5fHSuDghE\nK1HRAIl99YpexEbKoaKk3jFEJI15OYMsn8XqwbpMksPXwuAWkvm8Spv1kETA\nHdZz6kd82hUspyiXi8ZVIS0IxqCtKla3M+l0SsHsnMfbFP3QJdwolofyCsst\naTGeXTnpsU79MaDv280hDTMQlS+XaimlxujlVeC8Ai/QsbDlKy//RSEFlP0E\n1XPH7M//82dBsGwIgT0N11+syDGk50Qni0b0SreT8lKaupzq1GF84yTSsgeJ\nOjSbJJhPXH7CH86BzaIYHFUjiNDpvJR00oC/IJyHD9vzlYIsilxKFsGbRHlm\n5T55o5wou1aXuIpBPBAEdIo+YqI1xoNICyyh0Y38JW2Ml/2wmyoPkXNhIC9g\n4K5l\r\n=dNBq\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/mergeConflictMain","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","browser":"./dist/browser/mergeConflictMain","engines":{"vscode":"^1.5.0"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","repository":{"url":"https://github.com/microsoft/vscode.git","type":"git"},"contributes":{"menus":{"editor/title":[{"when":"mergeConflictsCount && mergeConflictsCount != 0","group":"navigation@1","command":"merge-conflict.previous"},{"when":"mergeConflictsCount && mergeConflictsCount != 0","group":"navigation@2","command":"merge-conflict.next"}],"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"icon":"$(arrow-down)","title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"icon":"$(arrow-up)","title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","_hasShrinkwrap":false,"readmeFilename":"README.md","workspaceTrust":{"request":"never"},"activationEvents":["onStartupFinished"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.402c9bee093_1618535526241_0.6266765737121716","host":"s3://npm-registry-packages"}},"0.3.0-next.5624d860cc5":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.5624d860cc5","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.5624d860cc5","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"c4eb90ba10e997cdbe618443facf8ab66b032eff","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.5624d860cc5.tgz","fileCount":10,"integrity":"sha512-YgssPuXzfYtr/Xa0ivaaR7ab1GRPxkHozh4zCbe655KKF9kW/wgJLKK/z4UXdDb9sfKqHU5qBeqtg4+DZILUXQ==","signatures":[{"sig":"MEYCIQDI3/DDnL1DG9GZ44PfK5+XmmO12jZ/jEyixXNSTdd8MQIhAO/hhcuBWHzrp6SFJHppugNRVgMpRGD194iTtlcf1uOo","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":139811,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.13\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJgejXOCRA9TVsSAnZWagAACiwP/1AYOUgnzLoRZbBBIPeW\nevzKpp2YTjYthfqwfvadP92Injkr2oD0JCdiqKGIMI/diTU21P0NTfbEAhzV\n42peXf/TYZSYowd6w4gh7jRGUsWXg8ZAFAoCrOg/cwxAs9CNmC45L68iSZOY\nQupJ63lFpshV74UPjaO9CVeSR5j47qijraRyztHJ/D7OuUSVwWaluwOgF5xP\nV5UfaSQqchXdfFLIEdyElcNF256oQfjj31wMnipcbk+4edYxkiTS1llymNCa\nRtDPi9IMEHHcDivb1E6VPYOzxC7e8jQzxz2ibFI6kk4OqX0H9/U/WkvtAP08\nzn6QnB6uW2KhqjPWqOxysP+X3OH7m3CfsLxRmfRTosnda/oKLKK0wpJkvKEX\n79Iu0LyMO0fnlG8HLkbjEw/SNOStqQGOCFiO1NUmJIDqBg5zLB6NPme35hj4\nTEJS1N/tkaLegwGoBY/yYf9+ZSUvEY851Y7sZfhe77FC3nP6izfgvyvy9Q5v\nx8xcNHTgzuttnhw+1y3FdHf58C0WrACUYuyHoACXcqYLRYf143p6Q9lt7zS/\nw7dT+hhuIlcyKgD6LbLlljqg5Of78/cl2rQnWh02DJe9NyfqGccrWEkvB0qa\nEO88yxNAMHEQKKP2km4ya+mQVSGl3C2If6Cqc5cPTJcX48GVW7rciMXazrdM\nWqcM\r\n=CJy4\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/mergeConflictMain","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","browser":"./dist/browser/mergeConflictMain","engines":{"vscode":"^1.5.0"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","repository":{"url":"https://github.com/microsoft/vscode.git","type":"git"},"contributes":{"menus":{"editor/title":[{"when":"mergeConflictsCount && mergeConflictsCount != 0","group":"navigation@1","command":"merge-conflict.previous"},{"when":"mergeConflictsCount && mergeConflictsCount != 0","group":"navigation@2","command":"merge-conflict.next"}],"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"icon":"$(arrow-down)","title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"icon":"$(arrow-up)","title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","_hasShrinkwrap":false,"readmeFilename":"README.md","workspaceTrust":{"request":"never"},"activationEvents":["onStartupFinished"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.5624d860cc5_1618621901700_0.7761196891279374","host":"s3://npm-registry-packages"}},"0.3.0-next.8e43ae3087e":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.8e43ae3087e","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.8e43ae3087e","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"cbd9c75ce0996ef2fe6af940373cbf7bc3dd170a","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.8e43ae3087e.tgz","fileCount":10,"integrity":"sha512-GJzo3TxQNWLveZBGhIQ0ccaSlY51UIF6/nuXrqkZAmlhBQ6c8qTa92mcaCd7ZqjAJTBNGE+rn6b/BHomTR0ZWg==","signatures":[{"sig":"MEUCICj8z8sL/DUCUHAas1nLcpcJP1bcTEsT3xrAm97zjPw1AiEAyvBmzQsYw9hS4cqZzeF33bjNiaUdim7xNu6MSXRWHeA=","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":139811,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.13\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJge4gSCRA9TVsSAnZWagAAA5AP/0Rt7QTJ7I3Bw26HUGnB\ngpENDVo1WZn6lRFysUB9SQVnt/XAe3fYxbXYrdr70BzhR6JKUcD/xwZZH4Du\nQWQJrmcA6KX6ppswNAthFs6l85ngw5CQKIqOt1eymWhuZ/fNSngdIOvlx4yE\nbhCPU7LgvMzBQkn/NvPnz40uu4kGzC7JTeUL6PuWpNmltscSgymsb77T5rRK\nkAQBwCFMmxWTUGqWe9erQBqhHtTNSmO9I8ntFOBXoz5uYYAW8Fjp7oo4QpBa\nO7TZ/8NnRFwVCUHTmu65KzXNdXH9De5SMYIVJrCnPqwjuyx9SP8Cll9V6FKQ\nij4NffWoSYwCzAsTfQ3w2pw7sKopN5Yez6/fAPuhxH34h9MpXjinPduowbO7\nSB0znjH2RivhJAGWXTKMTq5D1OlYyYEuKCuFfQezhHNvr+/52OmFxpbuI7r1\nvoEfjQ9kPM9vmzOAWGsCL7ikodewFUNsjYBlxYr5rX50FzVO2iAezOYRlEp5\nPRpoDP1n/2jHnGtVHRrn2aPBJUVpZ+r2HPPPZ6Cygj30RUeY1VATFqBaEnd2\nWqd0pTClQvcwYTsOYaLDh0FyHJ9PxwUHg5W7PMsZEadb1RqnJfqGsYW8KE01\nh9sPclC75q+9ZRAlZqkyJGFBkXpxob+hRW3zjdunT6EAhtMjrhQC4Q8beDeA\nPS3Y\r\n=e3z/\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/mergeConflictMain","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","browser":"./dist/browser/mergeConflictMain","engines":{"vscode":"^1.5.0"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","repository":{"url":"https://github.com/microsoft/vscode.git","type":"git"},"contributes":{"menus":{"editor/title":[{"when":"mergeConflictsCount && mergeConflictsCount != 0","group":"navigation@1","command":"merge-conflict.previous"},{"when":"mergeConflictsCount && mergeConflictsCount != 0","group":"navigation@2","command":"merge-conflict.next"}],"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"icon":"$(arrow-down)","title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"icon":"$(arrow-up)","title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","_hasShrinkwrap":false,"readmeFilename":"README.md","workspaceTrust":{"request":"never"},"activationEvents":["onStartupFinished"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.8e43ae3087e_1618708498169_0.36017810404545814","host":"s3://npm-registry-packages"}},"0.3.0-next.8aff878db25":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.8aff878db25","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.8aff878db25","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"fa8c4db6093a82f2e9fc86db7994d3ad981b520e","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.8aff878db25.tgz","fileCount":10,"integrity":"sha512-Pe9rk886Z/Q+wfY+1X0XugNLsOG9vewZJRqnI472R2vVSoladHdaHmD7pxfi+qr88fK+yePRyXCVpHa+Geupxg==","signatures":[{"sig":"MEUCIQCehA4sSe0mvM6zv7nFsjYgbJQwDSIdamjEs6Mnyn54vAIgHHhAYEmHEgk59qOPpQWDgcHoXotJvVkXbrQYvbHq11o=","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":139811,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.13\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJgfNk3CRA9TVsSAnZWagAAfZMP/0ZCINHBHEdptOGb81Qp\nVigeugP6Y2sWlHF4qV0P+3hsC92xT2qNC83HQqcZ/fPwuyrjRfIAJNEQd3/T\nbQ1YOGfrsYlAsRC5n1UzQaEanrtjgxEgzj6k/eXJqNgqr9NzWGslG02QeOjb\nmP3tqoDgj+hfNI9yA3wBQCzXRCligHKeEhw69IK6gWnqVrLmt8a8X1klfb4S\ntJe/8IlbZCVQ7oKtOwiNBzBRGKx439xuRPeE8nY675DTzvmdkjLAO+e5Agsf\nwfs2LqeHBI/i9C/8SRz8mvFnMryVUZ7pKrA+pmXfxEEK5IS6ggiCqdViaHnd\n2VXzsS8qdFYL9nrWPF9NiDrxG4TgseRn2B+ERRrWHyunWh8/vco9ILSGwWPo\nqI124Sx8ihhKsWcSJCllkX43qDEJ47z7lpC6TP9GFZKM34PEFfFyvAQghASw\ni+D93FyKHAdu78ARNm9SNBfubS1uZSS/M8Zs9cpv43cMB1OPL7JFi7SFhT/D\nPa85uKd9NDinrU+p8ObSEwIjPdcr5cHNI3/gtlfgbzRMgendb0S9QVouJj3h\nOrBGYcOBrHg1BaS4HdX8uOHGa2XYeS0IHq83BPFE9EpD5Fs4qLrj/NlDYdvW\niRZumzjAO6K5Bvz3lgtZ9ZDZObqtdWx1brT17QXS1jzvOMVW3WwpQZdTw1YJ\nAZNw\r\n=Qsjm\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/mergeConflictMain","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","browser":"./dist/browser/mergeConflictMain","engines":{"vscode":"^1.5.0"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","repository":{"url":"https://github.com/microsoft/vscode.git","type":"git"},"contributes":{"menus":{"editor/title":[{"when":"mergeConflictsCount && mergeConflictsCount != 0","group":"navigation@1","command":"merge-conflict.previous"},{"when":"mergeConflictsCount && mergeConflictsCount != 0","group":"navigation@2","command":"merge-conflict.next"}],"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"icon":"$(arrow-down)","title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"icon":"$(arrow-up)","title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","_hasShrinkwrap":false,"readmeFilename":"README.md","workspaceTrust":{"request":"never"},"activationEvents":["onStartupFinished"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.8aff878db25_1618794807449_0.4454896646445783","host":"s3://npm-registry-packages"}},"0.3.0-next.65273f89bc1":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.65273f89bc1","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.65273f89bc1","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"7e20692f2e4f0399029981d65b74a59a35bd5f19","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.65273f89bc1.tgz","fileCount":10,"integrity":"sha512-V6CMaJZ3A4th45fd2WXQ+bgJDRiERKKdqs2y+BscmvvsMB+Qjtd+O00gwmg7KTMo9WcxdkVxvlu1TBklIAijyg==","signatures":[{"sig":"MEUCICAWGnAdMLJ1ZFwewadz6VYTUca30bekTDoYyJaqXsolAiEAjSVdMMyLhR4c9i9bJJ6rtAIGQQl2eQRDcV3/zeqGwzk=","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":139811,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.13\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJgfir8CRA9TVsSAnZWagAAbJcP+gIjZvcTCHy1WMgn/nlw\nJHCuJn+qVKIpdGC4JymteZ/BxioxXifEP6ic2yWDiFe5YdcVziing+qmHUoO\nPkV+ZE4itRsKDpuq4JZkGgTLOcMR5MIGh1+iIdoFsCE2I2wBNHNgCnXeMNHl\nd2eklfeAOFeyEnA6V/ESijWg37Xjn/rYhUnuDc07l2sOWFzd9W9H8zpfQQ5Q\nsKwIqr/U0FNrVhagjWF2A0pj3ngN66wRIaNDyD2z+Nq3PG2gRuuVgJkJzm33\n7PQVFXDUpwdK1tHVkalr0bc3/N+VEDfhB+bRJy0mubGeoisrhkYQ0OVL8tGQ\nyHE/9BfXmU9I08aDFg3ugZM1bzXEOX6InEzAwuSPK8VY5yafAr27fDsqRhqE\nki7/msh2XV4bnr/cM10MvVryFLTJntYVXQ2iyfdvydcj2N1GWd8Xbw0Sj+3m\n8m2L2YUX0kibKeAH2Ni7Pn3VJPF5CTpWxCfWVmxCaGwi8gQjeiMV1LWddOz/\nRVDjdzRSyiJzNdnjLTQTFwM1OHactsWqADiqfCkAJ9Je9GoBudw+ZrraHio9\n68AdqsXKPFN+FuzWgVPaLJwbf4UHpQlKWPjcenEQFmLZeCXaFnBVZeUYj9SI\n0+YmU0mc62wbUvsSbPyB4VPYuRt/VUxanjHoNIUQDy4zTgE5BsZel+T03MNv\neoUq\r\n=TAZq\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"resources/icons/merge-conflict.png","main":"./dist/mergeConflictMain","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","browser":"./dist/browser/mergeConflictMain","engines":{"vscode":"^1.5.0"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","repository":{"url":"https://github.com/microsoft/vscode.git","type":"git"},"contributes":{"menus":{"editor/title":[{"when":"mergeConflictsCount && mergeConflictsCount != 0","group":"navigation@1","command":"merge-conflict.previous"},{"when":"mergeConflictsCount && mergeConflictsCount != 0","group":"navigation@2","command":"merge-conflict.next"}],"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"icon":"$(arrow-down)","title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"icon":"$(arrow-up)","title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","_hasShrinkwrap":false,"readmeFilename":"README.md","workspaceTrust":{"request":"never"},"activationEvents":["onStartupFinished"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.65273f89bc1_1618881275870_0.4384437638666938","host":"s3://npm-registry-packages"}},"0.3.0-next.7947c4d3f88":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.7947c4d3f88","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.7947c4d3f88","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"e5e005d6a40e11485c934bdb4d0ac9b622f9f985","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.7947c4d3f88.tgz","fileCount":9,"integrity":"sha512-8S9juPWX05DoEMGkk04VbApDbzu6TAXOjvYdGmfaSDACS71ibkdOdWxmPCT34rUdpbAzbBCrS4v8Brh+YWcigg==","signatures":[{"sig":"MEYCIQDybli0i9yMV2JwkxuzpD9JKQS4wMCWlU76Uw1FJ8avMQIhALMMId8nYTyj4JEf10wtuu+cPRT26bU3awSkL29WDcjG","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":140081,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.13\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJgf3wOCRA9TVsSAnZWagAAEQIQAI0RVdRbwXgIuvz1+mGt\n+NUaNgRa2f+5xyRvSiz1X/1PVIfidEd7mJcl9VGJ1hQl2t91B4B/klLdFYN+\n4PgcnEj+NYp1J9UUxUBrSxTMDbGPuUQquadsQ9gCWextKtE/u1GK+wxttzBE\nW4GAhVlPrMXC11AQujFzMVhTU+TxhxAm4sVonduAiWRpGHB1uVuBe/U9kZN5\ncTOOjGM0J2LrTNGkMoKj9FUn8xGORzKZxpzxPOsYmuj3S4h3NOpkRdKaAoxV\nN81npe/JFIr9hiOOrp1gSgsdIPZRVw9B0UYAA9CwK61KvIfL+GXb3U6J2UB4\nR+5b9irjuBY5USOIR684u+U6ocdUpWReWGBWeLWnOW3fYMoEIB1X1y31EKh0\n/itm2UI8QfxD8GutKWdhU2VkLzpKpeL1012/uFuUDYpzqZglrz/ZXtFhfWIy\ny+PxpDvekYxOkaoayk2qAVG48xBTONjDotT9d0KdgOOCJabXxGYs93ihWpiz\nmOCCN1yF9db+Ilkapt1QWSzEjaPtijyUp0Uqq/oNhB9qqlwnspDoXdT9YKPS\n4eWVWxS5c/N5Ksdf9f9EE2pLe0HV5fHvEoORMpA8NSIgOL+2qwsEt5rcvtkB\nC2QEOr2paTcJN2wbQ1tHbHzSdCB9ZIXnsV8utkIdXPrYXZCGudUqFFZZlWHw\n2SxD\r\n=JMZ4\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"media/icon.png","main":"./dist/mergeConflictMain","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","browser":"./dist/browser/mergeConflictMain","engines":{"vscode":"^1.5.0"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","repository":{"url":"https://github.com/microsoft/vscode.git","type":"git"},"contributes":{"menus":{"editor/title":[{"when":"mergeConflictsCount && mergeConflictsCount != 0","group":"navigation@1","command":"merge-conflict.previous"},{"when":"mergeConflictsCount && mergeConflictsCount != 0","group":"navigation@2","command":"merge-conflict.next"}],"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"icon":"$(arrow-down)","title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"icon":"$(arrow-up)","title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","_hasShrinkwrap":false,"readmeFilename":"README.md","workspaceTrust":{"request":"never"},"activationEvents":["onStartupFinished"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.7947c4d3f88_1618967565953_0.265921868130234","host":"s3://npm-registry-packages"}},"0.3.0-next.a689b7ec842":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.a689b7ec842","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.a689b7ec842","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"34566a9e1ce4e4785a82228bc70ebcb9eb6e9946","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.a689b7ec842.tgz","fileCount":9,"integrity":"sha512-CSXgIrdlqvlgLWIew7Pw7J1w+6KIEPX2e9Tf/TVDi6gPkeMJpodZeh/IGhCjDlcfuUIMkhNwj+dbOuCgAdKaig==","signatures":[{"sig":"MEYCIQDzodG8kRKeDBEXwMrNTTTOgAgLpCkPOnUAI6ab35u2qwIhAL6rzrTMcWoLwzISYU8QXTQ7T0Xx/Ae1AqRhogFlJp+D","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":140081,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.13\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJggM2ZCRA9TVsSAnZWagAA9ckQAJJBsJOXhBe7uzj8bkeP\npsqNqjAgrBCDrURoKaNtKrPZM8FnBOocIT47txAq8jmS4OmOIWMFm2vP8cBj\ngZOPjtv/FdWBwhAgelM6n+z+DM5pgNTqzT3g+zP6vc8PDJaAJ5+lGM3R0smY\nwGQrR/rlyLQOv8VClW0mm9nReZynQeWAFhzxEYj7Lc/L6jKxX8J84m3oj6/s\nN4nmGdAGuyW/JfCI7PHpoBHX7F6sUFZH3nioGHa/Lz17sNMgoOwndbpHA7gY\n8/GWJTGrCUOPixq5r82Itho/bSrlZR6XmTrFw+zaBnFtML0NWqcdZNP+fdwV\njzgyph5anqMZhw8EX0nwS4w2yzNv1FZcKfuNeDbXlLNRNfRRE+V1iSedm57G\neZF0jCn6+qkf/9BCxEy6vDKHeR8t5I7w7AL7oPgy/Nbhv8kSzf7kJvbQlPcp\nluhh2AbLIDdyri64gmcKy/IKFMiBS4bS9HRUETByuXNVlfkmUS+GnzBeUXL/\nNBzrntI/M/gA/QMN5QLDMiHfcnx0+83F25rG3ygp7Ty36mKhnDfyxFUgBDej\nxaze6iyys/ZnmeqvI4sYAzeaIfWNuBf3qo+4oRsJfFJt69v3sa9X6iz3l+te\nAu27o9lUB/gomitF/YwJDboCnu/JBbcslhk1nEW9IywRWMeWBCSBsVlpbZSD\neS3L\r\n=jX/6\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"media/icon.png","main":"./dist/mergeConflictMain","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","browser":"./dist/browser/mergeConflictMain","engines":{"vscode":"^1.5.0"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","repository":{"url":"https://github.com/microsoft/vscode.git","type":"git"},"contributes":{"menus":{"editor/title":[{"when":"mergeConflictsCount && mergeConflictsCount != 0","group":"navigation@1","command":"merge-conflict.previous"},{"when":"mergeConflictsCount && mergeConflictsCount != 0","group":"navigation@2","command":"merge-conflict.next"}],"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"icon":"$(arrow-down)","title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"icon":"$(arrow-up)","title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","_hasShrinkwrap":false,"readmeFilename":"README.md","workspaceTrust":{"request":"never"},"activationEvents":["onStartupFinished"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.a689b7ec842_1619053976737_0.40585314095276304","host":"s3://npm-registry-packages"}},"0.3.0-next.4853ea69eb4":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.4853ea69eb4","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.4853ea69eb4","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"71c2ec6f0fb7b7a738416df1e6c49d24846e7160","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.4853ea69eb4.tgz","fileCount":9,"integrity":"sha512-BEWJC2no5eAir3P193AFBpAnAw8y4nix4Tg78kbKLCRTC5cj3sovZrGI+/twrh8JzhZgKEgYu9jY0rbx4uAmog==","signatures":[{"sig":"MEUCIQDdnhButa+5x2BoOOB7jcMhVevFy6EU0cQXutE78RwMPwIgWQYDlznXbQxAkq47S1wegwWFWmgolIGf7Skb40c8DmM=","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":140218,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.13\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJggh9/CRA9TVsSAnZWagAAd2UP/37Lr8+viz/Mx0/aLn0Y\nDB67OiZlmdPF57GVv2nw8UsHSbPsE5H96bRAsWPyEOuYpcRpigFMEBefOzZw\nvUBMLaMHQkwKGVwLJy7+2PZCzwSWZ1r2Met1OxB5mQ/sHUYvXuGRtMRGB5gq\n7SqyqUvzZ5k/cxYPRyJKfMHOlqsPqHijufhyF6LXYBGkxvbGhzzzN2phjf5g\nDpjDJVGwTvBCzE6SvsLJQIkP5EnuvVXYhL4Ic7FYvJ7A8CuQQuCC22c2+1xQ\n4vNfTVkCioJA1s511cbseVdx7w9ZaVPLMXmQRfBuhji8nu/RVWu3UO9h4r1X\n68qLn/t8dnIufWA7aPUjPTJn0kwgW13LaWA2gyF0evt8AEjwI6rhSIe1UXdD\n2lUHCloqVsaOYQWuDoM9fcAarX1sNFvNiMLdXmsTWriPGrDPxp/gdxQT4RAH\nJfuBCAV8Xan8s/qXCRCWXAmX4kJbtJO1yGZFFMHyTRywEDRAJ/7vpdJ4HrTT\nrYTZGLtfdjDtM3XFxbgoV7HvjopqKNLGGmPseSgALrxgHgAYtMvRWSpnzy6/\nSbR22A+945W9vfxhPEbfBWRxATqxK33yMXwKHUsTj1KgqxM8+Cmwq3FfwmfS\nKa0EoBi21VO8chwqVidqsTN2AyVUBn/UUASkOtsRzBVDvuSKOUjyx3h772j2\n9DCQ\r\n=I7Ls\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"media/icon.png","main":"./dist/mergeConflictMain","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","browser":"./dist/browser/mergeConflictMain","engines":{"vscode":"^1.5.0"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","repository":{"url":"https://github.com/microsoft/vscode.git","type":"git"},"contributes":{"menus":{"editor/title":[{"when":"mergeConflictsCount && mergeConflictsCount != 0","group":"navigation@1","command":"merge-conflict.previous"},{"when":"mergeConflictsCount && mergeConflictsCount != 0","group":"navigation@2","command":"merge-conflict.next"}],"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"icon":"$(arrow-down)","title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"icon":"$(arrow-up)","title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","capabilities":{"virtualWorkspaces":false,"untrustedWorkspaces":{"supported":true}},"_hasShrinkwrap":false,"readmeFilename":"README.md","activationEvents":["onStartupFinished"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.4853ea69eb4_1619140478586_0.43471366496687835","host":"s3://npm-registry-packages"}},"0.3.0-next.1a46de24eab":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.1a46de24eab","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.1a46de24eab","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"6bdc6b0e9bdc78a8bc2ce7ccbe1953eb5f7ac128","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.1a46de24eab.tgz","fileCount":9,"integrity":"sha512-BXTpljua7Wk0IvPj+hHKqU9B8Bjtj4lRk/oQAsONxCUk+vQbgZEZUmZjLZQHIE5kG/3mvxZV5alRBYnf7Ujnbw==","signatures":[{"sig":"MEYCIQDzL1nGjnPESvQwBQh1zZrUILm0fBTuWC0otjPsAec8HgIhAKP0dDI06hVvxZcXf9a37XqRC4RpsZGV9k+U701rUWCC","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":140218,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.13\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJgg3D3CRA9TVsSAnZWagAA8HUP/R7CTS9L+qRkZjp1nkxc\n+OVBkDr3azKEUxoes1JHo4VP4mPP9/enqjD9Y/2L4MwzdixrPGqWoSFRU66v\nsipNrWqosdiCKDTc1O0MbA29yR9VTA0MdoZxp8lzu+jHOCa5c5awzmqM4cDq\n/YZVLkU1fQiqEaWjQU6vJhxF78APZt0krpo8L18zmcHSU5PoVh5eLmCa2A0Z\nqPg4lNXkIu/0eFi9gTe1JlWRaH8Cb30pGKjAx1MUBT8tAfPxVlDTyrgnplup\nSFWYpIJXSFZzE3roTfLHfJIYM7mla+TSuXaDrwRAH+iSZGzYJX5eKdaSg1gW\nPDAc4tcebuIhPuUBfnlU3CP64on3mnuWeNF4iL4ejivPlLo7HTq6q/K0cncs\ntkFwtEtGnH1fhWD9j/OSZllbmYBjLxisu+oQbFWzm+cicvgz8xwhE5GrNO61\nDxEGc7E1qqYBROq99S8uwcWcnzKBngV4tSxFuWDqpL3bwA3BPCHYx1bLbGPE\nWqKTlaC3+Mv7KJDNKAtfvZn7yOqX1d/BSGWfzvJCDMKTGFC0jYNl4lasQAq/\nbCP4o8kGaNuQJidzkQvoyKTvLp6rOE83r2MtoWC5NtpxApzuIFSXk/lGbogK\nIdWBa544NORWl3EQZwX1GVxOJOjlKWSoYsWH1xWnZWwhrDGAWKcBZEnKl53K\neKC7\r\n=svq4\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"media/icon.png","main":"./dist/mergeConflictMain","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","browser":"./dist/browser/mergeConflictMain","engines":{"vscode":"^1.5.0"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","repository":{"url":"https://github.com/microsoft/vscode.git","type":"git"},"contributes":{"menus":{"editor/title":[{"when":"mergeConflictsCount && mergeConflictsCount != 0","group":"navigation@1","command":"merge-conflict.previous"},{"when":"mergeConflictsCount && mergeConflictsCount != 0","group":"navigation@2","command":"merge-conflict.next"}],"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"icon":"$(arrow-down)","title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"icon":"$(arrow-up)","title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","capabilities":{"virtualWorkspaces":false,"untrustedWorkspaces":{"supported":true}},"_hasShrinkwrap":false,"readmeFilename":"README.md","activationEvents":["onStartupFinished"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.1a46de24eab_1619226870644_0.035400495239375385","host":"s3://npm-registry-packages"}},"0.3.0-next.08d37a85a3f":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.08d37a85a3f","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.08d37a85a3f","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"ebacd342c4749cb10426e519aab65b3e3ed2aef1","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.08d37a85a3f.tgz","fileCount":9,"integrity":"sha512-9FfR9srIe9U2SiLe2FnpHLr07c+h5GbM9Nf6p5+UpQKy6Ek08GkSzbVIdOwx0rhw2br58iOLS8dthkLfaf5gwA==","signatures":[{"sig":"MEYCIQC93WzjjmO3qg+4u6jh3OTU1/G4Wm004OYm4HftpOEImQIhAK70eJRP+IAUH84IWqRugAQFd9pgd4ngW6gNaIpYt1oj","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":140218,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.13\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJghMM0CRA9TVsSAnZWagAA9VUP/RZB1UZVs7kUbQvyrhOW\nRVGvHycdcD4knvORyRA5vqeztDAZ0wScm/96FtvH9W73y2IVFed+McWJRnSy\nKe5sYh96aaHgWGSIC63yvmmrH38qUUwsCNs63F9F80APMYmCHoZgGuI1CPbD\nqFpYyu5lnjz0qWt4G9A0d5z729TuhNCWHtJQ7hb9Qm2054mu4KZtpHDKdqvW\nme7YJ/tSSTWOAZbzUJ6O1OX9QizHmNKzHkIcYFM6yyInzSxpmIWXiGnERw3f\nmfqlWWYfCmMlN11xBXlvs650JlLAEI7Z2FGZHIyoEYzZMHZVDWm5qGyNiSfs\nMMiADM+LWAgO6edit8L+GF+7FsXZd+tp+wqLFlOiDCxnSMBIP5miilyyOH4k\njlqtJ2FAXqv8KnhR2frFqy8xSfP2yGgwaPI8YHkGQMkt3I76/R78Skr5vn3R\n2Sq/oV/OMahAB89o+T+W27yA5bwzpYBfnnyeQqN+V5F2wr/bANpTwvdbyVat\ntDJCuJt6fMAer62FHUSTmFtaMDtYp9JqyH/tlIhJxErR2G0EmUT/TtrIe8zy\nZ6345LNMrWHr8DmWlMxMRXCphUKBsBCmKjWpY3APcpJX8fB9t/up1s4XIR56\nb7iWuaoxqLxWSwWTyMjUMNaYrOP9Yk3FKdyygcWjPZYIEC7k/bEcyWNfNXbZ\nhKcA\r\n=SIBR\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"media/icon.png","main":"./dist/mergeConflictMain","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","browser":"./dist/browser/mergeConflictMain","engines":{"vscode":"^1.5.0"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","repository":{"url":"https://github.com/microsoft/vscode.git","type":"git"},"contributes":{"menus":{"editor/title":[{"when":"mergeConflictsCount && mergeConflictsCount != 0","group":"navigation@1","command":"merge-conflict.previous"},{"when":"mergeConflictsCount && mergeConflictsCount != 0","group":"navigation@2","command":"merge-conflict.next"}],"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"icon":"$(arrow-down)","title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"icon":"$(arrow-up)","title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","capabilities":{"virtualWorkspaces":false,"untrustedWorkspaces":{"supported":true}},"_hasShrinkwrap":false,"readmeFilename":"README.md","activationEvents":["onStartupFinished"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.08d37a85a3f_1619313460114_0.19937519076125532","host":"s3://npm-registry-packages"}},"0.3.0-next.9e9ad5b905f":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.9e9ad5b905f","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.9e9ad5b905f","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"442837dc6f82f3cc37d4c448ed80e88fe4cb2acf","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.9e9ad5b905f.tgz","fileCount":9,"integrity":"sha512-hLb4gvNCPEwMqm7eR2aqGW6ojFAK/9zIYST31T7JVgLOijGL/GVLdTVZjD1iJFZPO3cOF8yGGOkXfuxuNLZIYA==","signatures":[{"sig":"MEUCIQDjCjvnbhcoSzHbUiPNQ0EkJFH2sZnIsDjAaE7FQriJWQIgLyzfQ/bQ69XnGwbm85A7fnbXNFQe3f+LdXBP/VPHhL4=","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":140218,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.13\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJghhRFCRA9TVsSAnZWagAAevwQAImuyATiVf/eerLKTzoy\nznWrAns/wU1DINgms4yOx+PgeqyX8g8ZMDRvfMkwiP6GwqQXrdWrVWzsEfKa\nKqtQym293kcReBX54QE7It3YGinvv+oqUzWwNw3+H4liEpo5p1j+7C4yk/mo\nLdNDJGse/DOmG7gSWxwiJvYx2K2dZGEa/aLxfVOceYOopsYB/eHsQoy2JGDw\nW/LBAieBlooc2DbtzK9sQT8AdVzijKH+7KzYs/XCPkYUil6lyOevvK++B+vO\n8PvWJF4P63KP0lXhJswHoZu779hwRSktablm0cjJ3FoNQki14FOS3vfWh6Dw\nYs0CV+aoy3Y63huNw/wCs0ZpqRjTVDz83MvrW/J3Ytmz3XrKH6A98OW7r4vx\nWITVlDK5yeoVMKi/MFgwAtctCvrcEhM8R5N3VpFpZNd7CS14rH7x8c4QXzA2\nUj383eu2anrRPqnYMcZc7BRFhx4PpTuBvBmkCILYnmYU+wuxewNmtfHuF9cR\nie8Krm0V0hNcEjY61cuKlOEwYWmf8HE/XCm+Oqg2tq7Vl4xBnlQcf+Rw+gZd\nR312O6AJw5KtK07ikMnC+Ytn1ypa2sdscaflLwLfoMfGWRW3FLPcmYW4EfcM\nB+JLrwJx8uTGHWqWFX4mbF/LDZsVjfqUQPQrluIfJxMAEeoSil0t01+OT5mz\np9UW\r\n=p6Zg\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"media/icon.png","main":"./dist/mergeConflictMain","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","browser":"./dist/browser/mergeConflictMain","engines":{"vscode":"^1.5.0"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","repository":{"url":"https://github.com/microsoft/vscode.git","type":"git"},"contributes":{"menus":{"editor/title":[{"when":"mergeConflictsCount && mergeConflictsCount != 0","group":"navigation@1","command":"merge-conflict.previous"},{"when":"mergeConflictsCount && mergeConflictsCount != 0","group":"navigation@2","command":"merge-conflict.next"}],"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"icon":"$(arrow-down)","title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"icon":"$(arrow-up)","title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","capabilities":{"virtualWorkspaces":false,"untrustedWorkspaces":{"supported":true}},"_hasShrinkwrap":false,"readmeFilename":"README.md","activationEvents":["onStartupFinished"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.9e9ad5b905f_1619399748704_0.5904545175807936","host":"s3://npm-registry-packages"}},"0.3.0-next.e95ce0a810b":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.e95ce0a810b","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.e95ce0a810b","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"adc90eaa00833518d03dd6a015fa53381a3a6627","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.e95ce0a810b.tgz","fileCount":9,"integrity":"sha512-9QWu/n9Croc8dl2A69zn4ca5mJDonZFf96FTCt3mAqPPaa8mdo9DU8yrJWPBCu9mN1rZmTSX/mska44PEa43qw==","signatures":[{"sig":"MEQCIEUJGf/I0w7ldpagaE7Rw3n9eMa0X0JOz0zOwB8s9RMqAiA+uxBNlZQCX61XEk108ifk4f8lzl6nG72rx7wtCvZZww==","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":140218,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.13\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJgh2VRCRA9TVsSAnZWagAAxGIP/iUk/8oov33aKYGbSyc8\nra0MLxgc1TMy4gJ8yE7zldYztpTY1T/nNvzcyJ2SNrKaL+iQ1gd9mfqeFdxr\nArJyXiO8BBQrx/nwBZOi75iAhPL6aLt8q35P+JcmCQj4JBolgXV36LpdtQOJ\nRhEmXrithFRPdvJ7F3Sb5CELXGer/UZEzAGjUrzCklWyqitN5idmkF2lSywy\nT3d2hymhjz5TdA4Zhhw7x9zaj6bTmtT756Dn1tksEI2vU2dCqpGr47g1457L\nTS08+6WSlCC9Fgl/ML2MNAchKsu7u0EldKbNdjGowxmkjOTYZJmifibEHov2\n3iHzn0bnT/aBOxF5SnauUP4+L6e8yW1hjAmfTY7bp9t+0H05ZaYOZlPa6sli\nIYxoBdMrNcQMdcZyvYag0ym1XKXp3w3gL8oeqy2e12k8SRi0Ssc9WTzX4fjY\n3yyXhf9CoOHGD2tojKCPINfUjQuVeN/AfbmnvlgYybpr+YmajI/C3G9/Pag3\ns470fSsKgRf0i6FXRLjV8JMooMOWpzjIxQBqhII/ynuFg8raOOpKBuwAvBAU\ngS9ZE9YA9DFpJc/jteehDsdTHXnlb6Wvvx4qU3+mbJRJ/ymkAbPFtNh07ugm\nkb8pOmegO9r2BCReUPTLgAXOwVhuPF7UqZeWjefSPYsYbulu7+S5BKZBbQWv\nt6PY\r\n=RHTo\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"media/icon.png","main":"./dist/mergeConflictMain","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","browser":"./dist/browser/mergeConflictMain","engines":{"vscode":"^1.5.0"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","repository":{"url":"https://github.com/microsoft/vscode.git","type":"git"},"contributes":{"menus":{"editor/title":[{"when":"mergeConflictsCount && mergeConflictsCount != 0","group":"navigation@1","command":"merge-conflict.previous"},{"when":"mergeConflictsCount && mergeConflictsCount != 0","group":"navigation@2","command":"merge-conflict.next"}],"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"icon":"$(arrow-down)","title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"icon":"$(arrow-up)","title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","capabilities":{"virtualWorkspaces":false,"untrustedWorkspaces":{"supported":true}},"_hasShrinkwrap":false,"readmeFilename":"README.md","activationEvents":["onStartupFinished"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.e95ce0a810b_1619486033206_0.6437183488604106","host":"s3://npm-registry-packages"}},"0.3.0-next.27b39a13a00":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.27b39a13a00","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.27b39a13a00","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"6938e8c11407933808e972b8269a4a5156998b0e","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.27b39a13a00.tgz","fileCount":9,"integrity":"sha512-Ih04G52nltvaq0M0+QYmuY8nENm0vAz+XR0QmfB5yNkFtub1516isdB+XC9vg9rl/zI0CWHsLTqDWvy2iQ5N4w==","signatures":[{"sig":"MEUCICrIMQmJGJjou0+cXfukw/VYv/LNh22PvOdtFWsH97cHAiEAt/za+hvtaOgcwthkDKJJ6VdgPWJu7LwyzsOdQezu4So=","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":140218,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.13\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJgiLbnCRA9TVsSAnZWagAAZLIP/jceN+kiCLN9Yq25s+Jc\nyFV3I3+aKqZ0jR4vZHaNSpPys196HvgG81q8m9SI0S7Wfj1MQrIkh+LB5mCj\nPVNFgFGRoUsxAoRF1pdlf6DXYd6zh/HagmjjF2YVlhcuk5BJOYFlSjoiY/m/\nNLPKnJHox+qRrarRA4QFQOtJHRgjMLGc3fzzN4KxtChdbMO/gBSe3fmv8mgt\n0nQWgBecl4O1zTMxRjpME9k+32JqijkWFSwhaasF3ChMOctCtg1UCd6jkWhs\nl/a6GHOOwodoLsIk2uUJ1DHe5XYO9DbMw2x+ghCVy5IqgKr1WnTIGV0bPcIQ\netrLshngqSiu5v/tIjd1ltHByQ1j09CVSmwycE+IlpCSJJ/Mkli3Qe96/up/\nqhOzsbMf9y+CaWsv71iTKv0o249oAHhZp/f7EvfebHD+QjH0cu4P5+AhZPPk\n9q1RTV8RIZzF8HbWlXS1+c4+mvvK/pQ5Tt3EzjkXTNpVvNVJ8eSGeKTcctwe\n1mpogMqR6ToPxsJKX6i12hjowQDtZgdvYHOQ81agCzpKdYvL9jjN/J0Di4+U\n5X+H9VbIv6FW3+wmZ+qMW3FNSnaXWb43rkKXQJ3Ha0FbSyxGpIqx4HtYP4Li\nlrp7P2dFsnBxhgkrVi/dnirkTIqH/u+cJfJOytxqaisFrFjiGaOjZMi7Jwt0\nYek6\r\n=PX/G\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"media/icon.png","main":"./dist/mergeConflictMain","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","browser":"./dist/browser/mergeConflictMain","engines":{"vscode":"^1.5.0"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","repository":{"url":"https://github.com/microsoft/vscode.git","type":"git"},"contributes":{"menus":{"editor/title":[{"when":"mergeConflictsCount && mergeConflictsCount != 0","group":"navigation@1","command":"merge-conflict.previous"},{"when":"mergeConflictsCount && mergeConflictsCount != 0","group":"navigation@2","command":"merge-conflict.next"}],"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"icon":"$(arrow-down)","title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"icon":"$(arrow-up)","title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","capabilities":{"virtualWorkspaces":false,"untrustedWorkspaces":{"supported":true}},"_hasShrinkwrap":false,"readmeFilename":"README.md","activationEvents":["onStartupFinished"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.27b39a13a00_1619572455238_0.5223469582697333","host":"s3://npm-registry-packages"}},"0.3.0-next.3915fcfe493":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.3915fcfe493","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.3915fcfe493","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"a0e23f593eb2649e3576b2a0f963d6c5edc26b65","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.3915fcfe493.tgz","fileCount":9,"integrity":"sha512-yr0cAajsIvjSiNiElYdgy5rEBAXmEa2gRJuPMFf7j7b0fivzZlrtfxHzwm9DjfSx/XFbLsruAJVTy0d9oiA5IA==","signatures":[{"sig":"MEUCIFzR8ohvXffmSIiC+8ktIB/MhriBoYmiQMH+gUdBs+97AiEAqWLPxSMvVwqaV5i2NerInMEpmIHOSlB+e8QAKPTzQQs=","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":140218,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.13\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJgigf6CRA9TVsSAnZWagAAcaMP/3HhIbjN1ghoKj12sXZF\nvCv72tJxVryY943gzsjwALC4uNGtrHxoVdsOyihbvYq/1KnFFS/ChJ65vv5j\nzoj1dIxHFwp/kXP1+3Bc7AJjrV9uJl4PUu5hZQqxWHVbs3uE+9ni1g/8qYwr\nsfgdwK4DhVcuNvz2ntClKXen/IgYHd9RsNRrrnEMEA5KA/9R47wVfsWIpJmj\nm2WTF7kjRMIaWiyW7GwWgFjPR+ErppioKysBSTIV3ggZLWOSw2du/GnZ79RY\npD08it2zYvDz+hiqhKDKdynP8aC3AYG8W4Zj8lDkTv5TLBzgzXPzJKhrI7F8\nX9oc4YSyMLrnU1tjVaaDzo+XvsuRiSCOBdjKh66wbBOHN0KwerSiyb2Fa/tA\neNbKf5Kj+l4CK9Y6cCsqqbEsaB98Rjr2OuNjpu0dkBPK7c9UOiZwedaUokQV\nNaU4jM6zQRk2MJQWtzWw8vizwTHxXtGmeJUXDgSmVnef8GlL3oVlu/PALOvX\nTO8h8gyk5j6WbI00zd02PI/BHAzyPJ3Uo+EKeDu6HJyGruRGAdYGfTbCqJht\nEBqwEoMWSY6UdZFWWiP6CPBrtbOKBHzbG+Tx4ltFSH6TPtLjXUJCi1hpyoKo\n3Dwn3yPjCHNMqpoauLNk8bNWyF3RnihSV0RcYVBd/BObBQW0x0T6C9s9Mx/n\nbi92\r\n=A3Ow\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"media/icon.png","main":"./dist/mergeConflictMain","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","browser":"./dist/browser/mergeConflictMain","engines":{"vscode":"^1.5.0"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","repository":{"url":"https://github.com/microsoft/vscode.git","type":"git"},"contributes":{"menus":{"editor/title":[{"when":"mergeConflictsCount && mergeConflictsCount != 0","group":"navigation@1","command":"merge-conflict.previous"},{"when":"mergeConflictsCount && mergeConflictsCount != 0","group":"navigation@2","command":"merge-conflict.next"}],"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"icon":"$(arrow-down)","title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"icon":"$(arrow-up)","title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","capabilities":{"virtualWorkspaces":false,"untrustedWorkspaces":{"supported":true}},"_hasShrinkwrap":false,"readmeFilename":"README.md","activationEvents":["onStartupFinished"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.3915fcfe493_1619658746146_0.04299072172860985","host":"s3://npm-registry-packages"}},"0.3.0-next.78577aa18da":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.78577aa18da","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.78577aa18da","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"8a68facba54650e270c1fc20885a6c0e0f83fbf8","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.78577aa18da.tgz","fileCount":9,"integrity":"sha512-zerh+JwslE+RAeUuBjfYCndm0OZrYsJs2b3W8+NawNdtlwGYFThrZZt+sut9B565sGEuT/UDyv83WaP4TFgcRw==","signatures":[{"sig":"MEUCIDVi8vI2uQaYE7K0euGX2sgI08/wbbif/bSrG9+Z3xFoAiEAtg2ZCUJ0MIRe1Xu3YUqiH15CQJqBRdmxDQs1wt1Szqo=","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":140218,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.13\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJgi1iECRA9TVsSAnZWagAADXIP/jUfn/IrnDktYWTeR9U8\ntBlNah+kxzdCeh2h0fOrU6YWUmRcASNnKyZwVg8rj36jqiV9skCxjyOY4bBZ\ngcnotBxrNvjo2Hl664vzEIZErskWJI1q1vNuOpOFjUvKuWOV0MUZ7VWKco+V\nE8L222F0+sd64mWwv1uD0Mv3KkfHJMQef2qhBNgysltwNHETrSw2+mgsyzBY\nhH52FmsLtRkpHN6DTKkQGvqiWgWI9Z/1cR3QlkWRDnW/j/CUUCG+xotCraBk\nD2eJmUfxvS23S0BjY801eOqFzub2yJlpnRkANsQJAT8AlP86PHQ/iyP4ahRf\nIv5PmKD0CFkl75lt7FJq4f7jl9lNdeQd4E9V+RjtHbXu4JX4GfN/jn1FnOxO\n0rnnC8RbwbMRihI4ASDPnWlcVGYtgDRke/oZrQZlEdb5eoysESm0JYf37r4z\n0/zgV6ORco1Wf8uYBi1ygNxXqWk0iGEgeNtxjZrmwlnYBTfzjsGDmBBEQtcZ\nmy9DLPP4v9Wj0MYU99E5/nFIi2+B2xbC8vi+SpKZZyfGMHRrk5v90uLORhB2\nkrAjJQcyVkjWShVI6iiBvZXBC93Yf+0SHzTCbMWwjnTW6yHzuOHHqwrL2x9i\nkpBT7ws6Nxf/hGUd3bgkx4L/s6/uaWZ6dOBrbq2amQJVDJVvVuPgsIpxxcu0\n01zk\r\n=Faw2\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"media/icon.png","main":"./dist/mergeConflictMain","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","browser":"./dist/browser/mergeConflictMain","engines":{"vscode":"^1.5.0"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","repository":{"url":"https://github.com/microsoft/vscode.git","type":"git"},"contributes":{"menus":{"editor/title":[{"when":"mergeConflictsCount && mergeConflictsCount != 0","group":"navigation@1","command":"merge-conflict.previous"},{"when":"mergeConflictsCount && mergeConflictsCount != 0","group":"navigation@2","command":"merge-conflict.next"}],"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"icon":"$(arrow-down)","title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"icon":"$(arrow-up)","title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","capabilities":{"virtualWorkspaces":false,"untrustedWorkspaces":{"supported":true}},"_hasShrinkwrap":false,"readmeFilename":"README.md","activationEvents":["onStartupFinished"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.78577aa18da_1619744900302_0.33991659129899854","host":"s3://npm-registry-packages"}},"0.3.0-next.ee24dbfc6c5":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.ee24dbfc6c5","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.ee24dbfc6c5","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"ead248a6015a067ab54d5319f114027e7405c286","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.ee24dbfc6c5.tgz","fileCount":9,"integrity":"sha512-d0LWVd6oTPoX836W+s8efY4K7VsHuAcC/uTgxmmH89AzgzWWqrHZKbzig1rwhJ5qIj556jSHzS5lwQg5u+dJKw==","signatures":[{"sig":"MEUCIH0k7a9r2FLIJFSGHQKmRMhiIZ3qYvrEnATUMrVhuqb0AiEA5TlUS3kahyzDHOe5QAQFWFzPC1cKEb/xM20W7XR/mtY=","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":140218,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.13\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJgjKrbCRA9TVsSAnZWagAAP9IP/1qfpkNwAGf2WdCsxkQP\nWstUZGF+Om1bU9GSs4Mz+14ENYa2uDBSoKTg+nwOiqek984Z9QQ/m3LWH1mp\nE/a+duXxA45932AMIcVCC5QufbMB+LMIFuR60/dZ41h/O8WMArK38XuYqGg3\noIX3vNpt3uvw8D1Mzd/kxqZrqlxfQZJFfjF+Kmexn9UnOorJvpf2EmGhKBto\nQO12ldEd/aBpqorlYldiKTCTE6NH9u0mU6Mhr4Tx3XE3oTxmVXS1n8kaitbK\nWws1jznLm+g//qmcUfyquQOIvxHdTE18JS1jRky0ko6/E1MQOfN4osvrMHLk\nzrh80lSDcold5mHkvNxNdfLZuE7DUlQxrXbG0/A/CBcWFWbnX20Ynaa8duf3\nhhMCYJQ6wAVy0yuZu7Gpvb8A9v7+6DRuoukyGsp0UAsSkLjMIKEvdjJl2slP\nDWgR9JrTI1y46iTyQOzv+sNbKZVep/Qcbl/jcQoDz/OvaTvhAot1PDqwJSwF\narn1hRQjyo6QLY38ku62VTz3PZDf22XWRfXC8GGhT1VVGnE7Y6pwCcf+0pc9\n6F6Qs4oD8kYXWP2oMkv0KfENNL3IDy3VncDipVLu3qwG0JPAl3EVi65PTME2\nu7iFc6coMpCAKk3GWIoVx2vepFmUSFCl0HMoC5/uPCOdfqiLpiF8PB6tnhPV\njI7E\r\n=wmPC\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"media/icon.png","main":"./dist/mergeConflictMain","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","browser":"./dist/browser/mergeConflictMain","engines":{"vscode":"^1.5.0"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","repository":{"url":"https://github.com/microsoft/vscode.git","type":"git"},"contributes":{"menus":{"editor/title":[{"when":"mergeConflictsCount && mergeConflictsCount != 0","group":"navigation@1","command":"merge-conflict.previous"},{"when":"mergeConflictsCount && mergeConflictsCount != 0","group":"navigation@2","command":"merge-conflict.next"}],"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"icon":"$(arrow-down)","title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"icon":"$(arrow-up)","title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","capabilities":{"virtualWorkspaces":false,"untrustedWorkspaces":{"supported":true}},"_hasShrinkwrap":false,"readmeFilename":"README.md","activationEvents":["onStartupFinished"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.ee24dbfc6c5_1619831515326_0.9040369979560787","host":"s3://npm-registry-packages"}},"0.3.0-next.c8bd5b211ac":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.c8bd5b211ac","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.c8bd5b211ac","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"1d460efc53e95d185edb9e00bfc679b11878513c","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.c8bd5b211ac.tgz","fileCount":9,"integrity":"sha512-npTu+GdO1Lzdh4iXgtMW2Pk86NKC+Is2wMO6emxXnscYDzQJ4erVSN3ZfaldCzuMkzkl+hKf/Z2VrvgYFvJmrA==","signatures":[{"sig":"MEUCIBGcG031dD5Hd+57rlKHZdfQMQK+q6Rvr/Exi7YQG3d4AiEAtDY0GnCmfMf26h9HHhPwfjup+EQLA0+EJGU6qLWcZ0o=","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":140218,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.13\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJgjf0XCRA9TVsSAnZWagAAnIkP/1XVgGJqBH5rEsuxB2LC\nL7aPKf/xOKJFz/2i9t3S4tW8te0OlHBOaSA+f4LG78kMcBShnAxO95FAudA8\negU5jjEvzQI9YpE9AkWTppgC2Mkohbvr9P/70Lv6imbrp8XVg0QpmpqFeyF6\nNluJFLgjMiHeZ5CrGJPO/hH7BnjLPI+T4HrNDisNozvh1IMfRlTrhto/fF0p\nvysx5iH4J2jlpC7yY1Ov9bgc8IPjaD50wNphJQlg59U8/lNamxt75+ayinV8\n/FNLGhnfRp5MaSBFn5qSCgHBoxCygFzE6wYt02D8xoaTiV9VisGfIHfXbwSZ\nPPJ/3APJp4U8jtK3ypO6T9ePFzV0Z6fME4ov1Mw69cR+Grs1hJ5YgPjS4Qpn\nQesh7i7KD9Gu8EXDgRWPaC6jVgoaVna9fuVLEfWmFddnThJT5cpv2RVX7CAy\nQaS5iwMYJZTT9Bzy6jsolnnqmbksyZKiV8vju0OUTpjM5EERHfHjUFAcYsa0\nk8WYAIlQ0qPn88P8VCi2KmBLGxtjLeHBGVDEUMd3cxG9hljHz1bA3iKTy+xO\nJcXpDdcEGQ7qNdoP4Zt02kQAY18h4AL7LVLxrdKfiwEP3ksikAg3PvtqLB8x\nUBTxdlyq6i3ElzT6FiN3XXH2GTnCnz5StYHhEk3FmIrELbhI6fwNPfeQma1L\nYiFf\r\n=noi6\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"media/icon.png","main":"./dist/mergeConflictMain","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","browser":"./dist/browser/mergeConflictMain","engines":{"vscode":"^1.5.0"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","repository":{"url":"https://github.com/microsoft/vscode.git","type":"git"},"contributes":{"menus":{"editor/title":[{"when":"mergeConflictsCount && mergeConflictsCount != 0","group":"navigation@1","command":"merge-conflict.previous"},{"when":"mergeConflictsCount && mergeConflictsCount != 0","group":"navigation@2","command":"merge-conflict.next"}],"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"icon":"$(arrow-down)","title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"icon":"$(arrow-up)","title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","capabilities":{"virtualWorkspaces":false,"untrustedWorkspaces":{"supported":true}},"_hasShrinkwrap":false,"readmeFilename":"README.md","activationEvents":["onStartupFinished"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.c8bd5b211ac_1619918102544_0.9482575031552058","host":"s3://npm-registry-packages"}},"0.3.0-next.dc8bd9cd7e5":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.dc8bd9cd7e5","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.dc8bd9cd7e5","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"816fbfa7c20a60b0f7e88f5166eb39f02a08883d","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.dc8bd9cd7e5.tgz","fileCount":9,"integrity":"sha512-/LdqTKOaivyksJcVzZiLtHXfHr8vq8gc9wTBXcqih9QAWihOdDtzXbsCMWqRSjGbhhFp82p9cgEzAcgyBgGwNg==","signatures":[{"sig":"MEYCIQDnwPlsdGE2I9uvEvEF56co8SpRzeFYYt1dHJQ8P4YnUgIhAOuyixkOXBn+AZsJeFInD0bDSSMaH9RePEuiJGA9pReo","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":140218,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.13\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJgj02gCRA9TVsSAnZWagAA3s8P/1l9smCM0SetUPebaK+g\n0baTSSJsMUhXDcmwJQA6qFWArdZI9/25HOehE8qvRz3SWzMZYwsVowmLsxXV\nTpUJF8lUGfIaBDJGnSiUdJZMgBExcGy0U45zcbCnbI0DYnumKzPiyUJIztJo\nWr9rT2XSBXAUVNMupbU9U7WnmW9Or+EICMq/Pz5Vg+s8MjnYp6+ftEWCPlD7\nUJXeL6w6Lx0iS2DRjFFX+sdtCtBgzMs7z241XByhBwjGkoEXQHkdTK4Vnywd\n4+UtDtTMvUklKUZJYl0foknE5dAC77piLleZ39XVTJQmJV2NuHnz4eHZuJ8g\nbIQRySQZ8UFAr0lycUufJqMjqLcp/0bhw/RlwkWPyhr89eAsimlQXo34xWRJ\nU6xSjzn/2LP0nTO6ZgjP3NueJKWn48vAyaDYkYhvEy/8bLJG8Gl+RCEBmruf\n759NL7ztFLOEMVeZapd5CTtqLihjV4lP3OpOf4qytMQJfChNaKAy1z6WN9xs\nGvcaxmy1D/mWwsCluPPpee5H7E9qGxZT0VnFaIBQbsOHOW7W0ZugW1nouFbG\nAyLxbSrx1RDbNs2/FxkNlTpQAqwYrlJcWPkD2DifpuM3GNqqxlUwIIQVQ94D\nezjJ7lW4No+6gE3llugqhhsMx+JpEgMYEgtNWKbFfpQh1gC2v/vspU76Tsu5\nl1uW\r\n=qUHP\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"media/icon.png","main":"./dist/mergeConflictMain","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","browser":"./dist/browser/mergeConflictMain","engines":{"vscode":"^1.5.0"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","repository":{"url":"https://github.com/microsoft/vscode.git","type":"git"},"contributes":{"menus":{"editor/title":[{"when":"mergeConflictsCount && mergeConflictsCount != 0","group":"navigation@1","command":"merge-conflict.previous"},{"when":"mergeConflictsCount && mergeConflictsCount != 0","group":"navigation@2","command":"merge-conflict.next"}],"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"icon":"$(arrow-down)","title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"icon":"$(arrow-up)","title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","capabilities":{"virtualWorkspaces":false,"untrustedWorkspaces":{"supported":true}},"_hasShrinkwrap":false,"readmeFilename":"README.md","activationEvents":["onStartupFinished"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.dc8bd9cd7e5_1620004256032_0.5501160381843349","host":"s3://npm-registry-packages"}},"0.3.0-next.2e0644918d3":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.2e0644918d3","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.2e0644918d3","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"52722a5fa83aa1865fe4a8f4b6630aa78f6a90e1","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.2e0644918d3.tgz","fileCount":9,"integrity":"sha512-p0HEFSv/npeuBK14fngq5nL885Wiz2JWS6Q5C0EBWz3chPGSn6WL7+/rJ09TVFoRBOOryIQxDJwnsdES4j4wQQ==","signatures":[{"sig":"MEUCIQDhtlVKd+9WUlilAR8FDRZLOmFPxpp6p+LMTRNj2Hc/CgIgTy4R+9cdB90z9qNd7euqhwPKgYgPGITOnniUmpKcyY4=","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":140218,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.13\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJgkJ3UCRA9TVsSAnZWagAAmOUP/14BR9pB0OuEg6cfyk1Z\nVLZGGMKvpyrGY0lWlKuFSMnqUpLg/Ico69N+N5Nfx3fa62GTru1E9fND9qyM\niFyDH7/7k13qXuCHfwvp09crhrBGxC6MVxVlhiIQyJQwgHI4dwbQ66mJTd0z\nsal9MNp3OTNPzEEdBbt+HKU8+WWdfcHiqZZSYcbtSRwcyNAX6JXmNRPnFwjH\nifmxq1qFM64s8MOeRnBDwaNL0iyJyOUGwLy591PXHl7WE041a8NEZ/AA8jcu\n6r/zkhS56aBXJFRGBls+r9u9IHU4wc6aZlAfbymS5w6l3bAfI+ze+9keuhfD\nJ999ZvA61HfLfhpbP/EI+NhBghyMEZIta9MMrgQmvipBeigIdMYz5yaRy7BW\nMd0A+QmaiVo2mb45nY4YaHGi+dYdVERwvuplM3nbSWQgbaGsalrNIXLLzUAG\nt7fZiRVeU6q3KrYAW45VLSUo85H/faOvn05JSlf/CW4GimlA671m5FJ1IstK\ny7C7PYxpVVHkaktsU/9GHbAwj2sbpMlWVmqpbJpsWeReceVzC6l8EYrkZHZE\nLZowx50HARd4trXPlZ/dDnNlF9T/nrHY20QkkwS+fLEx4XOY/V2zgICk2BeI\nv5x7nLghIBPKzaWJAxMtA9S4Nqs3IriPyjbZk0iRcUnQp+jeEHyslmqcknww\nUpJL\r\n=hwAX\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"media/icon.png","main":"./dist/mergeConflictMain","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","browser":"./dist/browser/mergeConflictMain","engines":{"vscode":"^1.5.0"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","repository":{"url":"https://github.com/microsoft/vscode.git","type":"git"},"contributes":{"menus":{"editor/title":[{"when":"mergeConflictsCount && mergeConflictsCount != 0","group":"navigation@1","command":"merge-conflict.previous"},{"when":"mergeConflictsCount && mergeConflictsCount != 0","group":"navigation@2","command":"merge-conflict.next"}],"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"icon":"$(arrow-down)","title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"icon":"$(arrow-up)","title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","capabilities":{"virtualWorkspaces":false,"untrustedWorkspaces":{"supported":true}},"_hasShrinkwrap":false,"readmeFilename":"README.md","activationEvents":["onStartupFinished"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.2e0644918d3_1620090324130_0.319025476222607","host":"s3://npm-registry-packages"}},"0.3.0-next.cdf318e1e21":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.cdf318e1e21","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.cdf318e1e21","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"6a9177090dd749dafc6ee4062b1b176f2288cff2","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.cdf318e1e21.tgz","fileCount":9,"integrity":"sha512-RhjA9iL+dDN3Yjz04a0BxxPV/MtCaC3JRSqPW2rUEzYF2CcVl4rYvmwWpWvaJ51/waHK29TOu/20PUKwDNvQ5Q==","signatures":[{"sig":"MEUCIQDtg/0u6pgrkUH3WZwhOcv/WWlTx8UqCvfnq+tSHlG2EAIgejP+CgyrHq8WBJfElqiocDQbtG8yUDuxtQ+BjFzdtVk=","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":140218,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.13\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJgke5UCRA9TVsSAnZWagAAQy4P+QChSVN6SkiWlUQv9ycd\nSI4Ra9PHtiWGHpjVy/DdqpVwHHs2orevl6DnKbgEx56zFjSAk4eHspdOHNHU\n+SmgY+Nw6i3kApR3u+OuFO2p36gGi1zoJHAV1EWKqHmjyEPqKHp8q8N4/UL0\nF8FoZMKlyJAFtu8yerbNLIKbWE5PPbUqEhG1jIzhhpwSE3quTKLnCm+Rz3Au\nNaD/VMownj6slwSxDUGUaYC8MJvpQiN5k1y9eXZEyz7RRU4ePQYMPQJwQfMy\nVp4UfOWSv9KIEr3t7/G0VETjAp6N91S2Wa8mbZLGzfgM2CSOMG9GL5NNiOhm\n5DeM45G+1neH70rqF9NcSyPJiIlDg/jLqOVKdXvtTYAuU9QJv9uOvIEhv3T4\nh4+V2KstvvatbsG3DJFV1LEgZyLD2pdrah/5WsaAtB9XfCthJyCtLJmt8zlW\nH0JzBCqnDaiVAi+qn+GNamzc4N346LT4aV328zLsDG5aj/5nY3L25nn7owR1\nXuDNkKnVK75eUloEyF2NC7jwtwIoRkjbKfTBP4MPdyNc3pKBQCfCaIJpO1Pb\n5GfgI7kZEAFOKtsa0m0e1wRqY1imhq3+JlEIREdC9siL8947ekyOf+4el044\ndzM81S1s/E3kGqW+r9q5t2DenFVtD2gjQugf1y8Fc6XUePHHf8pUr5dzAbyY\nqLid\r\n=Bpcl\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"media/icon.png","main":"./dist/mergeConflictMain","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","browser":"./dist/browser/mergeConflictMain","engines":{"vscode":"^1.5.0"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","repository":{"url":"https://github.com/microsoft/vscode.git","type":"git"},"contributes":{"menus":{"editor/title":[{"when":"mergeConflictsCount && mergeConflictsCount != 0","group":"navigation@1","command":"merge-conflict.previous"},{"when":"mergeConflictsCount && mergeConflictsCount != 0","group":"navigation@2","command":"merge-conflict.next"}],"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"icon":"$(arrow-down)","title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"icon":"$(arrow-up)","title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","capabilities":{"virtualWorkspaces":false,"untrustedWorkspaces":{"supported":true}},"_hasShrinkwrap":false,"readmeFilename":"README.md","activationEvents":["onStartupFinished"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.cdf318e1e21_1620176468527_0.19506462584550155","host":"s3://npm-registry-packages"}},"0.3.0-next.6d964f3154e":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.6d964f3154e","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.6d964f3154e","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"48c848bd40547d623d610adade9d4bc4b35351e6","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.6d964f3154e.tgz","fileCount":9,"integrity":"sha512-/G246sH4swz56nlpnSPy7xSiKBY26GzWwzlX9b0UkQz/2d90IKKRxlGOuO2On3S2Yy5bnJmyEN1dhehEViMZSA==","signatures":[{"sig":"MEUCIQD0iN9Cug7mVzpAQRO9mPgzDiLeJSE63s8/jRXOxw5iWgIgN7pQ2nRwZWQ19qTF5IcwzCxLpH6sOPScEZ+hBc226uY=","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":140218,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.13\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJgk0AyCRA9TVsSAnZWagAA77cP/0REzyqhQ+FT/AOmySQw\nvsUynZYYTzCMB4OucpXGv51bXN2BGr1fUzaSE+7K9uC2O7nHGy9mKeEilFvo\nBzy7MZ+btDHmXYzPhH8WhFVbYUVgCmhP/Vovx2i9w34UFziTWFfRDT9oMZkA\nXVu2e21XVLx4iPGfi1TyXDQr6RjI39ypkTORCbBD3kwTI1dHvwbfJJYpKJwy\nKn6jYDHGdy4/dkDgVe1Rg/a/7TxarPeA5mPmvI29/CsuTce2QyI4kMARCsEw\nCJStCoiCBmdS3RMKTK9AI6nIrsgutvKMRmTAxPXuTxPI/bFtsaHR3J+CS4B5\nbYr9QTGgSuMGG6JeqlhVUKDhFsl/QQFznwpclUsMnz7/o4t/tQcobYYzQdp/\n3mZAOkiufpBgyzi3+FcdU7JSD2VMsyxG1/CSbf5i4LLMOZzhmabDWbRNtifX\n+rYdgwBzpohHPmBQpx7Ve/8oSWVMhDFEUPGeVxsk6cQBAoQjiAqO6C4wM+hI\n8d3nVOgoPYmMOfkzlNfooTKA6345RTbcQwrMgDZ1mSzbFODNtw6gZ9ddjH5a\n98zsgFS+F1ItkHlCTU+tfJQIz3tlGjhjjHuX77YWEzfFXjlooO8PxHHW8foO\n+E62f3KuNJbOMvIaubaf1drFMjmiRf03RTJbMO1CxRwUz/ho2VT6htF7HyYE\nGxDf\r\n=Tb2B\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"media/icon.png","main":"./dist/mergeConflictMain","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","browser":"./dist/browser/mergeConflictMain","engines":{"vscode":"^1.5.0"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","repository":{"url":"https://github.com/microsoft/vscode.git","type":"git"},"contributes":{"menus":{"editor/title":[{"when":"mergeConflictsCount && mergeConflictsCount != 0","group":"navigation@1","command":"merge-conflict.previous"},{"when":"mergeConflictsCount && mergeConflictsCount != 0","group":"navigation@2","command":"merge-conflict.next"}],"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"icon":"$(arrow-down)","title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"icon":"$(arrow-up)","title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","capabilities":{"virtualWorkspaces":false,"untrustedWorkspaces":{"supported":true}},"_hasShrinkwrap":false,"readmeFilename":"README.md","activationEvents":["onStartupFinished"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.6d964f3154e_1620262961998_0.46408265183209574","host":"s3://npm-registry-packages"}},"0.3.0-next.f6996f99621":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.f6996f99621","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.f6996f99621","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"6fef7e6ab8eb8016b9ba5fc32c19234610f562d3","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.f6996f99621.tgz","fileCount":9,"integrity":"sha512-EXdxgvmPhuwkOUvHpCVR6lQ/Gn3sG93YN+OrePBkocgCPnH7YdkpjgzFdfug4ww/blTrkuwS1D0VEUfQ8PcGUw==","signatures":[{"sig":"MEUCIFL80LED8zjDojr95kdw6Wze3W21TRgm3M8yfX69Q1bsAiEAs9/yqBdq1+jSyYpbkITzvT5q9h+et1x5AZxSrviIUwc=","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":140218,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.13\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJglJIeCRA9TVsSAnZWagAAilwP/RA7f1bZplOTlHWzv+VZ\nT4LFqz0NaE4nImIAfrDGt1Gxi8XKnF2Fl213gsA4rkXeMWMRbmnj23BQeiuQ\nwurtNdfjxTVzb0BjhnoYhsEpD6+rgwp1ME+jO//H6EAAI/XBx7AtbK3LydqS\n5ymMv31mvEPuG9Pk2n2RYSX9hOq3Jw2s9GcyTO3uOh2D3xm/B/E/Xkvna/IU\ngKlV4Xiv5cYUaWHNMClDQP4qFud4bQE1KoiOvpk1lcK3lxpNhZekd5jPr9rQ\nzJ5kM2m4wuzUgG3cGCrFYv10HfXtrNxJH0vSlkQ2wn7IbkPr6xBJfffOon+t\nPjMYhYNANWWaSXUR0YDSRyQnxcVVEF+DvUyFtItQ1KqFiiFVnVgWZP2hWKAr\nUvHTopI6OUi29M+/CzaZC2kaFxk+2j6iqM5IcveqMNlJc4GSkY/8Jzes3ym7\nXBNXwhj46pcltL2yF35CekDHWkjgMRMI+s8B1iJxI71E/dN/7a4OBfTxQm1w\nyCUXcdPOWRcspE8J0xEkJNq8UVvMjoqB4ZZz9Y413a7t3SbfbM4+6rt53/Y4\nzyKbYcemGsADU5kqHcKFXa/iA86t3ceLILZxKo3baRbFow7pVeQ/Uetj0bXk\nq1ftPODDFr421gz9wOlxIuExJJ4rjgH96Qx5tZnNLUGwu96uyEZnBbu4t/NP\ngMak\r\n=s1MQ\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"media/icon.png","main":"./dist/mergeConflictMain","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","browser":"./dist/browser/mergeConflictMain","engines":{"vscode":"^1.5.0"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","repository":{"url":"https://github.com/microsoft/vscode.git","type":"git"},"contributes":{"menus":{"editor/title":[{"when":"mergeConflictsCount && mergeConflictsCount != 0","group":"navigation@1","command":"merge-conflict.previous"},{"when":"mergeConflictsCount && mergeConflictsCount != 0","group":"navigation@2","command":"merge-conflict.next"}],"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"icon":"$(arrow-down)","title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"icon":"$(arrow-up)","title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","capabilities":{"virtualWorkspaces":false,"untrustedWorkspaces":{"supported":true}},"_hasShrinkwrap":false,"readmeFilename":"README.md","activationEvents":["onStartupFinished"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.f6996f99621_1620349469614_0.6231718873390095","host":"s3://npm-registry-packages"}},"0.3.0-next.2ee59df71eb":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.2ee59df71eb","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.2ee59df71eb","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"ef2bb0b925dfdf1b065b1f243d8035ef5035eaa8","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.2ee59df71eb.tgz","fileCount":9,"integrity":"sha512-6RHK46SQn3sAMEZndfl6vRKgmZZJEh/MAmYDjDu9l5ItVUa3MHOGwaXuZ8OdFXoEIg2yBgNCd8OLXs2VbcySzw==","signatures":[{"sig":"MEUCIEBWTS6YDQSTskbY63AD4ONDFK9xqlGBbShu1f+/vInBAiEAvS8wgPDrZy4TIT32X8G1v+lgr5jVGIzSMtnEKF3eCSA=","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":140218,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.13\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJgleNKCRA9TVsSAnZWagAAMa8QAKRkK2LkZrF+vhaySalQ\nWtDnKRNB54vTXIB634jhN1x8fzFDWPeihhKJ8QXtQUstc+1Re0O0YyBE5ItW\nDPdcsKA8rUofmc10t0Usuz1FPicmitV7b1I4cThidpVF4tcO2vNm/SfiQh/A\nri7L4RgEXqOM19Hn2pKyn5NlmXRKOqHHi/fik+0VshEqJMjtT5SqYk8/v2qD\nlj6a2uSxQlENjbYtL9wB09sxx9ouhYcnGCTgRFQHfrGLOZxSPr1dpb20Wad+\ntvncDYQT2T50fQPits8mv710fhL5q0sXHuVepRFWMNdKrPsAVZYHWzzWDzrQ\nwIrMf2d+ssfufJ6e7NLPzKiCNJzroYU5Qt/kX7UgxM5dRyuWUslpYsqd6p/9\ncy0RfbR7+kj3HTMxiCjUU+OiEOD5MSx0RjyyRUxI+9iYU43HT7C0rROuaeDj\nPN7S8GooZzPxHsZJgKqfZHB7SSM7DqA+v4Sa7lKIE6TO+qfda4Brc+qo2O77\neo82Jn7dEcG1P1c9PK2ZivDFZctD55I81ztJfKCu8RNjoZdylMu8czjm4P9t\n4Chf8W73gc6YldBFjuevouPmOP0Lm2gwqQ5VlDuBLEhGos6zGEEhZtGd1Fuq\nbPwdxjdqhXl/w9ITdfEqH8sP8/Q4NBPzPW/DWhIkoKziycpg4GKy3ZiSLMO3\n79/x\r\n=hdmv\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"media/icon.png","main":"./dist/mergeConflictMain","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","browser":"./dist/browser/mergeConflictMain","engines":{"vscode":"^1.5.0"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","repository":{"url":"https://github.com/microsoft/vscode.git","type":"git"},"contributes":{"menus":{"editor/title":[{"when":"mergeConflictsCount && mergeConflictsCount != 0","group":"navigation@1","command":"merge-conflict.previous"},{"when":"mergeConflictsCount && mergeConflictsCount != 0","group":"navigation@2","command":"merge-conflict.next"}],"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"icon":"$(arrow-down)","title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"icon":"$(arrow-up)","title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","capabilities":{"virtualWorkspaces":false,"untrustedWorkspaces":{"supported":true}},"_hasShrinkwrap":false,"readmeFilename":"README.md","activationEvents":["onStartupFinished"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.2ee59df71eb_1620435785867_0.19583899851673103","host":"s3://npm-registry-packages"}},"0.3.0-next.5979135dbe7":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.5979135dbe7","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.5979135dbe7","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"f3f28c5811eb5d268888444d91c348f14245af95","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.5979135dbe7.tgz","fileCount":9,"integrity":"sha512-3M1jVucf15SPtxGTgexky0J2pNzhzKuoOalcjSncovgiqbzqhhd4VG4rEyLgNLfnlCwziQka5yI11zwM+5kbbA==","signatures":[{"sig":"MEYCIQDSFg3OAyApd2dd/1RFyUhrhk7XypsC8uh73OBucoSP2gIhAMogoLl9+0VXenqRR4+rR2XsjTd6k+rAbRciYTUB8Mdc","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":140218,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.13\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJglzWRCRA9TVsSAnZWagAAORgQAKGgMmgRB2gJeSOk5o2x\nbT9dydV0BSWNq3ZMw5bbZd180AGic/uBD3/8i7QwgAeap0xRm7Eue6Mv7qzj\n9I3DeOqTWZwueanrTeVYdEkZKIg7VeDXIdFsQH4SXhmrff3sPuFN2Ph1nhzN\nfJmCC3muFmDt3sJBH1XYvYEixl9JsLf5wZTsuPTyfpYPdhv9QkN9g2FFl50v\nqY7kzb39yoiKsRq0k21REKaUdtKVSn0M0EAG4d0X4fy2paoaKQwV6kCTg+wJ\nRPL+c7TNS++0bh2fis27o6RLwLtVXickNOsu92lOO9IX0l3hkWs6YcFazLUJ\nDXj91XmlOF1lbBfiqPS8Pu9BI7WI0sRabwWxr7f29j7q76Ay5Qrgwf10S99p\nlVoaZQphfY3Q8yWnCgPiR9hAcKsj45ZVJ6OsT84ab/H5difb90IBLWbe9Td+\nwyJGiwd2UJT+zPEetDsTk34tV07bDxGdYl1sZGooLGOZZSjivnqc2mKRBws1\nm4qxfRffB0G4bZNgn1Vd9vitrWGAarUdf/NALIPwECWaTj7qlg+ijPeXcB/k\n5yDrWcA9KSRMBo8j3OpXr02/UYIuErCnfgXRs5Z74Zr/wnvB8/ADD9pyodp+\nXlf6titv7Sy/dR82f7exhAfxmymLBhZQn2BTQEjKyfgYYt7EAG6x3voTD3ky\nCZHQ\r\n=2FId\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"media/icon.png","main":"./dist/mergeConflictMain","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","browser":"./dist/browser/mergeConflictMain","engines":{"vscode":"^1.5.0"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","repository":{"url":"https://github.com/microsoft/vscode.git","type":"git"},"contributes":{"menus":{"editor/title":[{"when":"mergeConflictsCount && mergeConflictsCount != 0","group":"navigation@1","command":"merge-conflict.previous"},{"when":"mergeConflictsCount && mergeConflictsCount != 0","group":"navigation@2","command":"merge-conflict.next"}],"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"icon":"$(arrow-down)","title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"icon":"$(arrow-up)","title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","capabilities":{"virtualWorkspaces":false,"untrustedWorkspaces":{"supported":true}},"_hasShrinkwrap":false,"readmeFilename":"README.md","activationEvents":["onStartupFinished"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.5979135dbe7_1620522384726_0.4604616752592241","host":"s3://npm-registry-packages"}},"0.3.0-next.54d33cf14cf":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.54d33cf14cf","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.54d33cf14cf","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"e7b299b0aa85ca2ef89f325066190e4d97426a4b","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.54d33cf14cf.tgz","fileCount":9,"integrity":"sha512-fURSKdc1OVWsDcI6Y6oK6PnpU9dDHJ9mCLvctvbO41sGaafPvwNxhWzQe9vk1aMnBKpDJE/rekf9SyPnuh3WSg==","signatures":[{"sig":"MEUCIQC1l9LmbnwLn/ROq50nN/waBOMc3PYs5E1ldeya/0HgqQIgNz5dtSCwyFaNYi66Ke08zHYzUSlgNWAwIEJW3nJNneE=","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":140218,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.13\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJgmIc/CRA9TVsSAnZWagAA5AwP/1WkB1yDqe12+cEBRVnD\nWgBV8onCLSoNz8qIAuLBiNFhxKsghkIqUpnEc9t4US9woyy7VmmjCtyr06I2\ndOpMM01b8xn0p01tEY0mndyaReULoD8Rr4GfRogXFdqjTR4FPJtWMhCczINc\nBWqAmetDJ5GiJbRiDpyx5mwpB4O40quZrOAz4Yv43QBS2GU2fketCCSLSjJQ\nSzN5cG4zNBUfPZpdVciDkgxtrv5gpvl4NPZTK9ll9nVHCUzAQiRxs7LMOLDa\nwoMS5iWHniO9RP14ahLtO6z2IdrshekX5TGQRFuMYtBc4WkSE0CP1Q0mZ8PM\nwurhMd6rp2ercEZmEmNlBA0CymyiJ0i7L/vqKF49XYJCTCqhrflJlc1d6cLx\nwkTOiHnq4cPsDE+uOf8PxuR5jgTs5AA0hajduXwWuc/tCiWfooBi6xPK5/pA\nUUruBcGhZlYNMd81+0s6gnFij8A0N58L4klDD2fAx7wWHM8fhEv89tX5wtn2\npY1YSGcEnH3hoLUPn6sDKo/Qn8QdI3kktN/SBJPXY2s2dzyRX1MJaEmncuKx\nlgKebJBMj4avgEsYw9P3Q7js+VqqZj3/raldWkJJFhtFBi1YXX1ovbtDjgk/\ntICQHObdQjBzaFR7pkGisX7G8JdocAOPpNATsoSZH31i+zm/MgjTY4PllaDl\n8i+N\r\n=IAOW\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"media/icon.png","main":"./dist/mergeConflictMain","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","browser":"./dist/browser/mergeConflictMain","engines":{"vscode":"^1.5.0"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","repository":{"url":"https://github.com/microsoft/vscode.git","type":"git"},"contributes":{"menus":{"editor/title":[{"when":"mergeConflictsCount && mergeConflictsCount != 0","group":"navigation@1","command":"merge-conflict.previous"},{"when":"mergeConflictsCount && mergeConflictsCount != 0","group":"navigation@2","command":"merge-conflict.next"}],"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"icon":"$(arrow-down)","title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"icon":"$(arrow-up)","title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","capabilities":{"virtualWorkspaces":false,"untrustedWorkspaces":{"supported":true}},"_hasShrinkwrap":false,"readmeFilename":"README.md","activationEvents":["onStartupFinished"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.54d33cf14cf_1620608830889_0.7553867903418898","host":"s3://npm-registry-packages"}},"0.3.0-next.368c86c3f66":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.368c86c3f66","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.368c86c3f66","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"04157cbf490bc35256e9864062432780c1c11d42","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.368c86c3f66.tgz","fileCount":9,"integrity":"sha512-fW/WtFZK1tAuUx6LTuEZbFcdcqWmjFjowqYlEq6ulShz0Dn3uOgi0ThbIi0OcwlDw2RgW21IssA6dbJMahBkSQ==","signatures":[{"sig":"MEYCIQDcL0PnloT95XHRvXoPx4nA2GG8AuObFOLok80yrdrfmwIhALFHtUf8m80XI+AY35xezZ4sApk4IReBTUDGxAufbiqe","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":140218,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.13\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJgmdilCRA9TVsSAnZWagAAlvYP/jIIIPCnvM+aOuoUXbaI\n6d9PqkuItEb4nr5mSR2EkYZMZCuuXWejfFPp3a/y8IlQWeD7uKv2r5mauFDR\n8UNt6Ef4wgrL7+Xs8hTp6g0FkpUZbSX2rAX9noXeYYIiLwxpxU2cARrLg7U4\nOk/xqOub9y4lMpojLYLgRAztovVcw8daejhqp+xI3vZ9Kyujh6/SgQ5TL9AF\nIhx7wXIkNpU80wzakeMRaVJD+3cZ5AraCLogsxC+bfatSYJBlR0Ob1QcFiAK\n8eCWAnSVUfwu8kxVKBsiEWc87Ub0QuzqjnCuot5epaORBCvQf741cDizPbXf\nYxZJADdlvoN7XEhINBWwYd6x28SUn8j8osU0Gbwh7PNn+dTLx84n1H4WMq6y\nTCOxcXlD3gKH/giBE4T2HP0lQbhnBWcJ8ADzbkY2dkRLbt3DAGvK+8lzMgfw\nasCh9G95FwKW/KpkleAtTVCcQTQQReq9VxTV1FWJ7Yf6FztKTaRkmo4JeKdW\nlEAkI+m6SO4UVkQBarcATPSTQOLY9M72sLVrOq2lupKx8vFKTJ7SsSheGmJi\nC6VAY5LBHEpAoVxcqSIVwSZgw5MU7PqU51IbL550dE41KU1m1OdUWQZZ8QWz\nzObfPB+bT29sLRVAHo/QLm8vpr7152ZZsJabjotg4GmOxcT1HaEBiRRaDvVJ\nVZ4E\r\n=0kq5\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"media/icon.png","main":"./dist/mergeConflictMain","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","browser":"./dist/browser/mergeConflictMain","engines":{"vscode":"^1.5.0"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","repository":{"url":"https://github.com/microsoft/vscode.git","type":"git"},"contributes":{"menus":{"editor/title":[{"when":"mergeConflictsCount && mergeConflictsCount != 0","group":"navigation@1","command":"merge-conflict.previous"},{"when":"mergeConflictsCount && mergeConflictsCount != 0","group":"navigation@2","command":"merge-conflict.next"}],"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"icon":"$(arrow-down)","title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"icon":"$(arrow-up)","title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","capabilities":{"virtualWorkspaces":false,"untrustedWorkspaces":{"supported":true}},"_hasShrinkwrap":false,"readmeFilename":"README.md","activationEvents":["onStartupFinished"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.368c86c3f66_1620695205058_0.5472776085685402","host":"s3://npm-registry-packages"}},"0.3.0-next.ec4babc1987":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.ec4babc1987","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.ec4babc1987","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"3cb36cba8ec153688b48b6a45c269c4428e4f732","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.ec4babc1987.tgz","fileCount":9,"integrity":"sha512-9EHja2Yee5zjIUiVRQEslr9kRqywc5PwQWdmTuwNRvrUJq2eurF2//9D3Li+k0/5NqrVtFLqwFffbmQfbgz+EQ==","signatures":[{"sig":"MEUCIBt1hbxWHIVpUPFlEul2DcZaJU1Y1QWblhDPjjdZmDdDAiEA19RtNY1tPt3/wiDWI5psEjiohlpyHVVky4JK6k9H7Yw=","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":140218,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.13\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJgmsH0CRA9TVsSAnZWagAA7pcP/jl8/LOkoVyjF9/iCuKy\nB7q/d2krkjPmfKt9DfLMbN87heQFuFk+sCO/Nb8DQj3HgwNbowYpgPtXNdy+\no3aCA7Ghc4JwG+e+PW4tC0gZ0GUaFpO2kMdvp24eAX5CG39dCrvKmzycBtsW\niwSxNdWxzLOsS2CS6GL0EoYFFL4YbhrEx6sJnjLg2ZHL4LR599DYmXOh9LUh\n3Vyvu9PWw1Wz/Le8ixxbxVXH9fsujkfNFLGczdzK+nP0uwCYZHUqQjl5S9vI\nUuizfLNgLYFs9of0hcQAOd1BN5wl6FN2D5bccMYojPOfG64sQlsiwCg6PqNE\nP51wWgWk0oec3tAMxm93c7hQVe/99nc9/NxtTqntvF7NiTqerE561ueeZWb8\nZEfyLNdaMVj6RpY42H4ThNXomnYYqXDwEq3fzGHRfwpF7n3Nguz7EFcu2w4u\nqFYNjdDjV/LR/FnxpxAJkG8blCM7H1Z9bgemK68UaHvbp2LJ1m88htz7Rfgq\nl0I924suq0H5rZJ9jl6RIAHDFy8BtFUjDUIjfPDOQ6vgBihztgh19rpdUTaa\nBS4JQZs9SGekQTo5mYnA2dgaahsYm0z2OmqK4m8pJWuSpfgfPqIWIxyN1rTR\nsByKvp+Iyw+5WfUjCHwZnk0PCG9W91v97Tm4fbjTzxXlnPr8ioqddotQpNkE\nVo++\r\n=kKFF\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"media/icon.png","main":"./dist/mergeConflictMain","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","browser":"./dist/browser/mergeConflictMain","engines":{"vscode":"^1.5.0"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","repository":{"url":"https://github.com/microsoft/vscode.git","type":"git"},"contributes":{"menus":{"editor/title":[{"when":"mergeConflictsCount && mergeConflictsCount != 0","group":"navigation@1","command":"merge-conflict.previous"},{"when":"mergeConflictsCount && mergeConflictsCount != 0","group":"navigation@2","command":"merge-conflict.next"}],"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"icon":"$(arrow-down)","title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"icon":"$(arrow-up)","title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","capabilities":{"virtualWorkspaces":false,"untrustedWorkspaces":{"supported":true}},"_hasShrinkwrap":false,"readmeFilename":"README.md","activationEvents":["onStartupFinished"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.ec4babc1987_1620754932224_0.7299274150801784","host":"s3://npm-registry-packages"}},"0.3.0-next.bf24ab16e0a":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.bf24ab16e0a","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.bf24ab16e0a","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"3a9d8419b1dd8acaeb0108936c1fee6a493266e4","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.bf24ab16e0a.tgz","fileCount":9,"integrity":"sha512-7Nj+R9svBs/QaxLfJyAyHVkxOO9J2mZU7hOgnDrB1KUJe5vhRYVWlKOHF2CF7O+T0GQqa4NZsBFQXs6l1NzXKQ==","signatures":[{"sig":"MEUCIQDV4rri3xHW2ECmLSABwCWrTV01v7/HQBTwbHAljfOcTgIgePN7DqB+Zek/2cq7OQW85kFoBqVn/DLre7B9SwEfAKA=","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":140218,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.13\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJgmujrCRA9TVsSAnZWagAAxpsP/0U0IKHfNnUC5ENeH+Pl\nHH3PLsw6/+uhtQ/7+QwvLEQd4Id6r3GMLZl0pVaYFizKq4z2Ip0uGjtV3qUb\n3ImMHMryMdfhTzZXdsSBQpVKt6A6CWV+5sqH0sLHhakyHhgql9NOsRwuEi0E\ncA7hT/cW9TNfcVQP69AOz57nLqZ8Uq3CpWbSWXXcrcmFYtNzK9O6QV4FSCNf\n7WIGcAP+0O34IUPS6YTLHwWpruMggPFe2pJwavzo/KvO/zr8zf3nRuSlOb/g\n+MJ8g8r250jAtyHLzgwwQTVeioZJtYGcJ0liQ4bprGkgWBZUZyCcydIG9uK0\n22JjMWI7xlIxsW65Jfw1Fag3zrjz0l6MpDOxk9gcUEkLEDCukz/NQrmdUdK5\nIrOpIGKCeInI3+1VLilRdBYdCG0F4H/P7v8H+Wy+y8CwIhSmZUFSoT/LQujP\nhch8UcG+20aQc9jmnJf5xRVtwv69TzCpEnSFv5Ae/pbth7TKfpjpzDi6cYGj\nGtcV23X52D9mBfXTrBV/5XPXRcGLkdCoOTfBO/sgY8Won84Ad2Q/b1/noCSu\nN/GNt1Q1mVYzYGVxg+yC9v7bDWXfK2K3mPKsn/ATpCBL+5amY1h+/WJg2zXD\np/RBCEScBhugv86RQGAa/1ORkEA9xg0kxAN3cr+GBSwJuPvBxCkDRMgwxp7b\nlzpA\r\n=/ehg\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"media/icon.png","main":"./dist/mergeConflictMain","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","browser":"./dist/browser/mergeConflictMain","engines":{"vscode":"^1.5.0"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","repository":{"url":"https://github.com/microsoft/vscode.git","type":"git"},"contributes":{"menus":{"editor/title":[{"when":"mergeConflictsCount && mergeConflictsCount != 0","group":"navigation@1","command":"merge-conflict.previous"},{"when":"mergeConflictsCount && mergeConflictsCount != 0","group":"navigation@2","command":"merge-conflict.next"}],"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"icon":"$(arrow-down)","title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"icon":"$(arrow-up)","title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","capabilities":{"virtualWorkspaces":false,"untrustedWorkspaces":{"supported":true}},"_hasShrinkwrap":false,"readmeFilename":"README.md","activationEvents":["onStartupFinished"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.bf24ab16e0a_1620764907479_0.5124076488924598","host":"s3://npm-registry-packages"}},"0.3.0-next.927e791753c":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.927e791753c","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.927e791753c","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"7aa97f1b2f6fe75e85857c6471c106dcf7a97261","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.927e791753c.tgz","fileCount":9,"integrity":"sha512-CKrU3Lmuyb87SadneHQunLUs2RntK9Ululp1bYIkOU/+ime0E2Lw/kbhfTVnOJJweyMduKJCUOzz4C10BlP3GQ==","signatures":[{"sig":"MEUCIQD0S02SnNEUENWQ8g4kGvVZZLMyy6JDfKp/ynx/Jz844gIgDdtGVMYmid7r2oJQIwPiVF3fgUwVq/2jlQgwwQkQVQs=","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":140218,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.13\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJgmyqJCRA9TVsSAnZWagAA194QAJVzKXHFxsRCND399fNS\nz60oUznyOR5MHGidPJgv6uKeqG8Hnbrq8j00fLoXPhiZJD3u0xsDS4Jv1snm\n8ppf/nesrTBdaYuSGggtxvm5LYNZhtloSL0eT6Fs0AzHVVGCdZ7bKQlSVwfI\nBLfXTuUmcIUC7Jz9kFU8EjkNR4FlxuVhRSGd0bhjqftB2a+MfNQHLX9vVV48\nIjrXKXAfEEcgXbKhKtpcwF4j3V5xu+VOGp6/FOOj93NVCaIyHh6q3iL7SERZ\nx4X8k97U4ZJlg90wXrV+0pF8MWnfftDbpG/U4H/l77o1jp4bJMZWOx7ROFty\nqnlRfDiUt8DlI7lwDF9dozqy/OHMmgnYgzpzQN9Deu/lYAMTKGRliS2uyltF\nrz+e7py9X/tJBywpI9zuSrPvOfJJzIKWImigCXIQOqvx5BhZbYnHQ+XumwT0\n87RI82EByNAY9UJXRgE2GoFins4SamTHWAnji+7szeGCxdjdVSdjDsr1SVFG\nUpg+RLU0lve1GE89yfiBCr8/MjcYKJHV1dnpjs1ae1nLFgzSOGarqE3eamz7\nk0Y/BQHOpvJNsaa1242yvWt/dqrh4V8daB3bgOnQUqqJK7539pwP1UfK+hMW\n4xIncAK/sPqftW45nXHTERpCjFN/j32Xk8HY+IR3uMu/mVNChB4N5vyDjY/T\nq6vs\r\n=yh2N\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"media/icon.png","main":"./dist/mergeConflictMain","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","browser":"./dist/browser/mergeConflictMain","engines":{"vscode":"^1.5.0"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","repository":{"url":"https://github.com/microsoft/vscode.git","type":"git"},"contributes":{"menus":{"editor/title":[{"when":"mergeConflictsCount && mergeConflictsCount != 0","group":"navigation@1","command":"merge-conflict.previous"},{"when":"mergeConflictsCount && mergeConflictsCount != 0","group":"navigation@2","command":"merge-conflict.next"}],"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"icon":"$(arrow-down)","title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"icon":"$(arrow-up)","title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","capabilities":{"virtualWorkspaces":false,"untrustedWorkspaces":{"supported":true}},"_hasShrinkwrap":false,"readmeFilename":"README.md","activationEvents":["onStartupFinished"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.927e791753c_1620781705048_0.40115831119502077","host":"s3://npm-registry-packages"}},"0.3.0-next.1f2077f7e63":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.1f2077f7e63","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.1f2077f7e63","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"802aa50f066f0dac61887f90380a12a4b829bb8c","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.1f2077f7e63.tgz","fileCount":9,"integrity":"sha512-KHXx3JE407e7sCCXlZuQG8MhIu9mwNXSQBk5hf6OTaV7gFE3vAWKFBAksYBQBJI4M3nJ2Y9F4GPG/CR0GekbHw==","signatures":[{"sig":"MEYCIQCMGues8NBLMRskLyMcC69T4xKaKfox0NGIy3JUouGJ8QIhAMlKqO4QiSdVZmYznFlCtZ0njs/AL4f7dgz2r/VWqDcl","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":140218,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.13\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJgnH0gCRA9TVsSAnZWagAAGhoP/1UimyoW6wpM4eXH9owp\nfpG3xi7X4OV04Pws1o3rUCcjtPOHSJxASjfwelNKzKr1DWNbMFQBHPNrAWKN\nIpu2rYnfW0GoSWQr2qM9QS4sLi1cXF+Qdbi1C4FQQJgCtQHGz7U5auAW1TtI\nBzLJumUHBz8fJnE7t5tTrKSPEWiG0a+n4xurQQ5cr0FlqlJTycrM5hX4w0NX\nvqRw7nPXSWwhipKBTt3YAl4RzCL+eLn2u4KOsmvGIX/1enHuVLg3TKzrpmQM\nVoCIavWTAZ5OYJq0s1mRnAh2zrzuJ3ytSbab8quybBWFIUjMXqUSoeAiFM6c\neeghkB79gUe64G6z5hY8pd/AJCrtUFS4OXvV26Qnn6/9Gj6esLlD1pzoEgUd\nTYpqlr+jtNyJ19hepHmS9NWu2eF3plx4ihOXR2YR6yicjUifWrj2cgYEzhgV\nj1CE/ymDdpPngj74Tjimz8mHaHpjDnQXDJfUj1DbC9pgTm4WcggmSDgBbDii\ne319yKB+d3mLRtrcPIam7EZRgSHY6Mxp4Fklo+DRYNLaTKov/zTRz5julcAT\n5f1be1cZljUsy4Me7slOvVEj/VKEsRvrvweGnokMqi8yE5sTxrH9ABV6aJ6+\n4v0vntN+FjmHqPr+Is1qZ9VHyDB4gbJgAKOZh8XGFKsP414iRGPeAmj+DT0s\nGdDH\r\n=lhau\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"media/icon.png","main":"./dist/mergeConflictMain","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","browser":"./dist/browser/mergeConflictMain","engines":{"vscode":"^1.5.0"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","repository":{"url":"https://github.com/microsoft/vscode.git","type":"git"},"contributes":{"menus":{"editor/title":[{"when":"mergeConflictsCount && mergeConflictsCount != 0","group":"navigation@1","command":"merge-conflict.previous"},{"when":"mergeConflictsCount && mergeConflictsCount != 0","group":"navigation@2","command":"merge-conflict.next"}],"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"icon":"$(arrow-down)","title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"icon":"$(arrow-up)","title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","capabilities":{"virtualWorkspaces":false,"untrustedWorkspaces":{"supported":true}},"_hasShrinkwrap":false,"readmeFilename":"README.md","activationEvents":["onStartupFinished"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.1f2077f7e63_1620868383921_0.18601881162999745","host":"s3://npm-registry-packages"}},"0.3.0-next.7e037f8e8fc":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.7e037f8e8fc","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.7e037f8e8fc","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"6fd9ad43a5e8a1ae0806f51ca27a363a2bd43b5b","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.7e037f8e8fc.tgz","fileCount":9,"integrity":"sha512-YI/bb9irfcgfoDaLG8mXrdg5ucpvB19c4OhUyc/PGSxPd4CReGLeTsiHx5ZxQTOHHKZ8cMFeamNo5PngVdY7cg==","signatures":[{"sig":"MEUCIDnNXU14i3cL9OElvpJZLnEyRp0LV7KcghNjjFigJvu7AiEAwkabgxgGvFC2NDNWMfXN4gMFMjAU3UaTQzN3KX3fQbk=","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":140218,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.13\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJgnc6yCRA9TVsSAnZWagAAVI0QAJmGY9CM4mnP0EwP8fnF\nSIpfgrKXhgzOPGI6Str9A9ehJo8TQuAAE42POTVsolV2y8qYkWCDU/jyDH29\naRxZLkF3TQFRsdaD1oA41FpupSBHZs+Tn1UvFJjQ/pTPhQoLInPdqu2NBMiS\naRT4QrUuaPh2s7+/v/ox8SMgMZOtcVZ1lQ+EUVPBmFCYaYEULrAvHd2Hd61f\nJQxgb7qxvTEMNleJbSv2IF33bHGNtbFMdkay65T5S4BzzYmoQrz0I5XauVyi\nL5WLTF0pzjE1raxKyAEk8171DRO6rw4sENU/nEBHIASNvMdzV2DUe5ho9R/y\np+be9Jgy5LWTUX/Pr+Xoaha2jI7hRtZNhfxrVsjrRSu2AyztsoLiet5XYlnX\nMKxksSGGBOmZb8V5xS7j+RLMa7RuOO/RJ9iJwTlj+gobxHT1gHImR0dDSZTv\nDbDcV17DJ2OBD8K4dwR+x/SzyKF4ndQXeBHZn9xFn45dd9s/MU8/1vV6j+WV\nOlXryqdD+MIMw11WmRMY7KjEvh084n1r3Y8iCNfSK6EotQkXdCZjW3IdjgQ7\nKROKy8+j1ihFM4z3bNiwwYbXURZ5wU/XhwK3xnWIP+VHwrVQ43K0jzufNEZE\nADabz0KAqX5Z3dDNoGgG4zQ27YDMT73I6NVwy6R+z+hGqOs4olo2+sk9KBSU\nrkjG\r\n=5O8m\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"media/icon.png","main":"./dist/mergeConflictMain","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","browser":"./dist/browser/mergeConflictMain","engines":{"vscode":"^1.5.0"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","repository":{"url":"https://github.com/microsoft/vscode.git","type":"git"},"contributes":{"menus":{"editor/title":[{"when":"mergeConflictsCount && mergeConflictsCount != 0","group":"navigation@1","command":"merge-conflict.previous"},{"when":"mergeConflictsCount && mergeConflictsCount != 0","group":"navigation@2","command":"merge-conflict.next"}],"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"icon":"$(arrow-down)","title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"icon":"$(arrow-up)","title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","capabilities":{"virtualWorkspaces":false,"untrustedWorkspaces":{"supported":true}},"_hasShrinkwrap":false,"readmeFilename":"README.md","activationEvents":["onStartupFinished"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.7e037f8e8fc_1620954801999_0.6595554463807984","host":"s3://npm-registry-packages"}},"0.3.0-next.cfa977755b1":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.cfa977755b1","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.cfa977755b1","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"145b3c1b17ecf90dffa297996a736ea0202ed42c","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.cfa977755b1.tgz","fileCount":9,"integrity":"sha512-mv06zNEpCzmO/tA9kkDPGzesE1KVKMzjrJ3g32VqZBthnRkhKuXLqG/HvxElMf4g7cw0fM0bIZerInZUP636/w==","signatures":[{"sig":"MEUCICawxdQX+L+fVWsFXuKkmSBun5yhoI/l2cCDBlSRkqS9AiEA+y1O9sdVwfzDSZrllkvcCvzG9uB0omZuwKcaLHVEJDo=","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":140218,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.13\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJgnx+MCRA9TVsSAnZWagAAO/sP/01vFwe0JqRkcLqGNKQB\nY933AlQYIQ92itNGubnxwDKiZqPU/hsS7y0V9w5cCXwlNeguPlTqh5T0rx6T\nVJPEFSwLQSYCHttXqJt4zi9miVmmRfYzIBf2iNC4baPnr5//G/tf73lDHejf\n4SWb+7mwvees0z6Uf+ZONP5LVzv++n5qVty+PMlWCrTYhWsIdXKXvNQhgc5Y\nngkrcVkh1IFhd3MgG39PLNkyYy8sNW2MdND7z57DeUzUD8/55YgTpTh8Djyu\nHti1giXcDRfLSk3WusNfK56MSIoN010oxBEvmr/feAgT0KcGhkzlP2cWWEHQ\nbg4Pmx/g1qxAjgaa9hTLjoKrVDI1OKWUEmgOG0v/a6vFO37/g5s4PV4xL1kh\nLx8xXiSfrpg7pO++BIXD0p6/tAE1M0dKiy8KCGYXsnvC1vG88hjQWV/iTRGw\n3JkY/wsVPVkMIvZ4NULZ1JPZ59b8pfoRD7hNOt9LRHpjDTk0SNcviM5tU9k3\nks1/nWHgrnFCAt6npzERnVHodhuCy1FFezAChfaaqE4lnCmckqBKHdiIilx0\nhoGWUQJVkp+0AcQJWayB4hdddwT7tuWioxNfzWVoajFRaKOpRZweJhVAn9v5\nBAAlUmv2g8vWZtiLxKzLmk09fEe24yFQxTcTN280SxOOdgoZbOYIc3NlRFfO\nugxd\r\n=cjDJ\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"media/icon.png","main":"./dist/mergeConflictMain","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","browser":"./dist/browser/mergeConflictMain","engines":{"vscode":"^1.5.0"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","repository":{"url":"https://github.com/microsoft/vscode.git","type":"git"},"contributes":{"menus":{"editor/title":[{"when":"mergeConflictsCount && mergeConflictsCount != 0","group":"navigation@1","command":"merge-conflict.previous"},{"when":"mergeConflictsCount && mergeConflictsCount != 0","group":"navigation@2","command":"merge-conflict.next"}],"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"icon":"$(arrow-down)","title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"icon":"$(arrow-up)","title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","capabilities":{"virtualWorkspaces":false,"untrustedWorkspaces":{"supported":true}},"_hasShrinkwrap":false,"readmeFilename":"README.md","activationEvents":["onStartupFinished"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.cfa977755b1_1621041036207_0.413138064427647","host":"s3://npm-registry-packages"}},"0.3.0-next.82767cc1d7b":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.82767cc1d7b","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.82767cc1d7b","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"eacd47c6487bfc8f5fa343d6ce96a48575d0bc7c","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.82767cc1d7b.tgz","fileCount":9,"integrity":"sha512-bLTdcPCqjfPr7pjmk08zntvCV8QomVRZhWh+oV+kflNTVEDjkPgfrtitN6O8evrRxyuD02y9F8P7dT24ZJpH6Q==","signatures":[{"sig":"MEUCIEDBcPwhctj8OTdlgjMrABeu3qqFWnFS7WJ6MxFotPADAiEAqcKzDb9FoVRkb8NquNasbGV55aA8ApqkUi2wvVSRMyc=","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":140218,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.13\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJgoHLlCRA9TVsSAnZWagAAn0YP+QDaVMZbolVCu+n62rMY\nKoc8muGKA/VnabpE0WSh5V3zZ5ixbi9puY9f4zEXQw27Jf+I6CxswHP36uQA\nDYJ3nowbAmLNWMMayuHmxlqhwnLwanQCJgRAGC+HEGICrOOMw5vfPYuxRtcn\nuh4r2JU7Xs9c2x8QU4bG/o35lWyUD7Ksp+d5OBXSsuhWE30J54OhuU3o8y4a\nJRQxRGYXEt5dn19SiryW+rsiHZl9kDEHtZYdEcQrfnOpP7zsUUQsQumsTK6x\nxhg2+L/qdbGAl/pRuW9PhUdESV9TgBEd+g6ZguoQ25A5hyhEeTx9Gr7gFt11\nMIh9gb/5CKg6/ra5LnYeDIIKYGErymrX/RFcd0iqCWCg9qZdzsXX1aJ5JLCI\nIDRLDtaZYSWrPYgNmQsWUd2mcTKcLs9VnJoJ4LXsuVRokpLcYXoPiCnq5CBT\nc8C93cZCzVa3sCwGoNvp4kcsB0xNcr3qv/IaSiB2CRnhuAdYDzfw5a8gC6Ig\nq7rcN2nCFs1C+izBxwsJ732FbCvJpbFJ4vsn0JUMAjlODE6WZCe2rzTLWXbt\nYLvU2I332uK4Bo3bBQe1cQrJAuviaUbFm4/0oXy7uIwMipSOu27TtssgxyRP\n1iET5RJlzX8QCh4J3zyVKVa0Cg5smqH4mLb3U+EWari5/ON02NtcTF/sc69Z\ngdkA\r\n=krtE\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"media/icon.png","main":"./dist/mergeConflictMain","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","browser":"./dist/browser/mergeConflictMain","engines":{"vscode":"^1.5.0"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","repository":{"url":"https://github.com/microsoft/vscode.git","type":"git"},"contributes":{"menus":{"editor/title":[{"when":"mergeConflictsCount && mergeConflictsCount != 0","group":"navigation@1","command":"merge-conflict.previous"},{"when":"mergeConflictsCount && mergeConflictsCount != 0","group":"navigation@2","command":"merge-conflict.next"}],"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"icon":"$(arrow-down)","title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"icon":"$(arrow-up)","title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","capabilities":{"virtualWorkspaces":false,"untrustedWorkspaces":{"supported":true}},"_hasShrinkwrap":false,"readmeFilename":"README.md","activationEvents":["onStartupFinished"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.82767cc1d7b_1621127908608_0.756509212482499","host":"s3://npm-registry-packages"}},"0.3.0-next.45aafeb326d":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.45aafeb326d","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.45aafeb326d","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"f548e93949e6931e212e7455367d0eed8f272e6e","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.45aafeb326d.tgz","fileCount":9,"integrity":"sha512-p9v+Iapz0cjA4upBht8mK8iATft0h4RCDKVaBaT4WfCzBFwT5mt7SGWWaJnGGHzekU7oEVQ6EmI2YVlV63f/4w==","signatures":[{"sig":"MEUCIC4RIAXtMaF2ZsE3qh3ezfrNRzSDetPcK/G67q+5RncTAiEA9pKirEw2K+MPeXDAWfZp9dUQ2toKEKR/5xbQsBysPAI=","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":140218,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.13\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJgoxWsCRA9TVsSAnZWagAAO+MP/2veYJoDdAoZFd3zoGVq\nw1aoEu6RKPtlRCMGiHsQX2/OwGLITTqUkWgEUnnUUXXLTnskCFEnIXoU/0hI\nCs0dEPAsVAZnhLlCKpwEYCix4QerA4ZgXb6/nYC4+ronGnRbiPhxBeMNermO\nNoI9NK5XJCM3tL2Jl3hBnH6NJTMTJgYhSViWuzGSAhSxZyzTPuivOZK9YsbP\nkiFx7q76p94ZXT+ClBMpKrvtBkcR8JQoVzuYr/B3AOzjxVPzV9hOBjp/lyAG\nta5Vl2kY7N+JbQF+dnE3UMvXhMA0xaaoarOPo3yrzYXUP0hFikYtfr8XXZIx\nN5U6UMWFMsPCOsk0e8rjvVWTl+97qJphQpA15Hs7cX3qiLs6Nb8eYOBSrc+U\nKA0jj35VEzmbQFs1REKLm+tHhni/w9F1A+5mtZPYk9ZtvMnMl7is6I4VTybM\nPchT3hYOw2zLvm1bOeFk3qtWlVDrVMuWe9vQfWQQooKHSeICImLZKRcOkX3r\nY/+kktMLYJS3x6D2H42tm7yOrYVKS+Y/A5hHAFKEBQ8VJ1hwZ3CyiM9mfLo9\negprDbW3AQ7lSIIWYy6xsGcTKoJBigD9Ikw+LWdE85B/XZRxMtVXs2m7SFgq\nPZafP72jvB5wEkMknVpJSR+6P9IFyBwoo2amTHARd/nkOM3748iFHEEwwVoF\n1nqK\r\n=Kcgx\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"media/icon.png","main":"./dist/mergeConflictMain","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","browser":"./dist/browser/mergeConflictMain","engines":{"vscode":"^1.5.0"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","repository":{"url":"https://github.com/microsoft/vscode.git","type":"git"},"contributes":{"menus":{"editor/title":[{"when":"mergeConflictsCount && mergeConflictsCount != 0","group":"navigation@1","command":"merge-conflict.previous"},{"when":"mergeConflictsCount && mergeConflictsCount != 0","group":"navigation@2","command":"merge-conflict.next"}],"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"icon":"$(arrow-down)","title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"icon":"$(arrow-up)","title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","capabilities":{"virtualWorkspaces":false,"untrustedWorkspaces":{"supported":true}},"_hasShrinkwrap":false,"readmeFilename":"README.md","activationEvents":["onStartupFinished"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.45aafeb326d_1621300651994_0.410598076707513","host":"s3://npm-registry-packages"}},"0.3.0-next.bbb89b86f56":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.bbb89b86f56","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.bbb89b86f56","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"7b3a7a98936b27d44791e93fd7b540495ff4e052","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.bbb89b86f56.tgz","fileCount":9,"integrity":"sha512-D2E9Rz1lVllq+x8WcaaGuUXotnblrotU2wXg/FEHl2hYS9WjmznamQyI6YltM4mRzw/16dTlI5eBjB6c2AvbIg==","signatures":[{"sig":"MEQCICz+ewM7Q3FG8apJSnd9qGSp6q1OcGWShxO/OTZ+OrrfAiBt29b7AMMbFfu7EDhd/hv7Y7gK9vrWGLCbBjH6bxSahQ==","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":140218,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.13\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJgpGYyCRA9TVsSAnZWagAAeCgP/iR2sN3hi381+wRXTR0F\n/u+Eq9JQx45TTpUrEgqlQ3w9CVF/4IZfM8obJ+AyLYGZirVTodM/L5JYneam\nFeYJkp2ehp6ia/2eiSOSmZDweMqNd7lZYqJwt9Eu6p8G/+1+DnYpptabc5Yf\nnZKSsL6ycxM/d0/yc1oDMaWEjA+Ex3EQS3j5Kow3U3dw5UW/KJjfsm/0z32W\ns1EC3QZ7mMl6d19zGE82bxlK36dKzX9tSxGKaR7xUYV1NUbHgvYF6Bpv3wqk\nuZ8GA1hMI3rH2YHlf2pPKinvi0L2EdAxV8iyBbwTleeoVrGM+G5kWAEft4/I\nyQuFNfvhZyck6kwc79+StKU8TcMw/n2Dn/FHmACzBG0CwfoSw7RWghKO9vY6\nRdHSvmhUh7Ni3OdsRGyvuIKB2xOgX0Ga8daE/eMM4kTscqB/+ZJk5kZ1ZIm7\nn3k5n0glKcKtklzKtgIW11NkoSkTq1MbD06ul69EGLLUKAffN9p0J4GCvz6q\nZM5UC5/1WPbU7kSIfCRT3FMmmH4OGu78BV0+/Vs48aGz10hTQKco8ZF2dZiK\nq3Pr4uuUeKIcdTXgE8gtF1igoH92St2LlPgOhyb1jNQpiR3u7f6UCu9bUmre\nG6b3lapTsrFx+JI8asj2xXzB3M9r/dbHyN0o0pP1XSA8MQXs2IgldmgQ+EQ/\nxvgs\r\n=LlN/\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"media/icon.png","main":"./dist/mergeConflictMain","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","browser":"./dist/browser/mergeConflictMain","engines":{"vscode":"^1.5.0"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","repository":{"url":"https://github.com/microsoft/vscode.git","type":"git"},"contributes":{"menus":{"editor/title":[{"when":"mergeConflictsCount && mergeConflictsCount != 0","group":"navigation@1","command":"merge-conflict.previous"},{"when":"mergeConflictsCount && mergeConflictsCount != 0","group":"navigation@2","command":"merge-conflict.next"}],"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"icon":"$(arrow-down)","title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"icon":"$(arrow-up)","title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","capabilities":{"virtualWorkspaces":false,"untrustedWorkspaces":{"supported":true}},"_hasShrinkwrap":false,"readmeFilename":"README.md","activationEvents":["onStartupFinished"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.bbb89b86f56_1621386801843_0.3987475515239671","host":"s3://npm-registry-packages"}},"0.3.0-next.1ddc623e585":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.1ddc623e585","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.1ddc623e585","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"51c281e5e67851459371231a7707bc032d6a22b3","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.1ddc623e585.tgz","fileCount":9,"integrity":"sha512-7WO1TL8+BgXDVrc8r/HTkJKacII05cn8+jmXBQnx41nNNZ4EtE2pBsCWElIveq+Rsupk1nj/lErxC3AldeOAXg==","signatures":[{"sig":"MEQCICxx39iX2+9IMrj3G4gm5YPBqaDxiFEmGOoIUek5kRaYAiBgNWT/OvD5UE7ZXgc41qtb7XtXP7M1zpn2zJVuHBcgfA==","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":140218,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.13\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJgpbcgCRA9TVsSAnZWagAAR1UP/j9qZgV8GZ/za+Iz6OQ7\no52rs4LLi9TMz43gBk+xWYmki+phMZwlsYHFvX4GSBJjjnmM4M5BFsWp9+eT\nWs0pjqGUlAMvFKHBQ8Kgkz6kJvkDm/O9XiwP9jhhy5Mo1EngKOO2MPeYaLmX\nw64Oi5BAUqZBN2jtIxA7ziZrn8Axd0IPaHmQd9Ue30wTlxyO0VPhU+nFMnxX\nQxRwrFwF6L26a3qEhGJr4mO4d36qtQVYY/660fuef+AfoYBChqxig66AHdbu\nnpTrWj/JMOjI9MD/J3LSR08XmbHwjTGjYXI0q5tiEUAk8qiIr+l1K3JPFEah\nTVq78O4jfnb+cWi0tmh2WzLFijLry0JHZbLD+uluWhxkUWZF19Uigf+quH0B\nmDJZq0svYQrBGEQXdxyRJ7vni6huLNSUMyOaxDrn0PJRxqzUGKjOfrssP7Su\nWDsywqFe4V6W7zasM+cCG1vrBZxopUOWhDjZmaPeHyARu1+JXMiMBc+GIUX0\nsmNt66vqGktxwbgFuMCuRYgmkjxJ7jf06p+3ANOFnrwwBaANltBGB/3Tvkr8\n2L/Fn/wV46AwroqMTsghH46vmTzrzo2U2sK44utbqwtjkaYmd669dbVFpoFK\nwgDdN5kyNj6684bVghI3pMz5CTtwqnHawvdtxWRcbeKdMtISAg2lKLz6rRg1\ns6sA\r\n=J/ao\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"media/icon.png","main":"./dist/mergeConflictMain","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","browser":"./dist/browser/mergeConflictMain","engines":{"vscode":"^1.5.0"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","repository":{"url":"https://github.com/microsoft/vscode.git","type":"git"},"contributes":{"menus":{"editor/title":[{"when":"mergeConflictsCount && mergeConflictsCount != 0","group":"navigation@1","command":"merge-conflict.previous"},{"when":"mergeConflictsCount && mergeConflictsCount != 0","group":"navigation@2","command":"merge-conflict.next"}],"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"icon":"$(arrow-down)","title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"icon":"$(arrow-up)","title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","capabilities":{"virtualWorkspaces":false,"untrustedWorkspaces":{"supported":true}},"_hasShrinkwrap":false,"readmeFilename":"README.md","activationEvents":["onStartupFinished"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.1ddc623e585_1621473055604_0.00791175841746683","host":"s3://npm-registry-packages"}},"0.3.0-next.3e5faf69c14":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.3e5faf69c14","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.3e5faf69c14","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"cd31aba7666381e9162338ad5cfe8921de968479","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.3e5faf69c14.tgz","fileCount":9,"integrity":"sha512-Dypz7Tp1FbXSNO3fcBTF/u8UG8cJcEW+Xy5tQU4N/xbRmrSsk2KK2SOqoUF15DyWsFui7LCB2s6BeCSDj8iyvA==","signatures":[{"sig":"MEUCIEB8CXAiQ51NQsE2HdRCbqdp/YpF/WIMRutVpTU78X/VAiEAnLvYOZOyZ2rEbiW9GCVIZsTdilYWJXgDrh0DNfFNn00=","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":140218,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.13\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJgpwk+CRA9TVsSAnZWagAAaKAP/0urNHXb5KfNaWUquyoO\n4K9YZN+DjLd58vfnTyc85hqtbsZyB0nrdnaAYIPNohnmz13pB2MmhKDd3UpY\n2LISjDyWA4ums58k07Vzkls6L/9Nd9bu4JymGc43gppxlwqUtoQV9tquEooN\nnxDMSVItSE8JZY6EQEuwNjgXVZCqYOJeMuUzzFdkQPxouvogTZaex9EpDqjX\n5doHDpflwdaTNKlpOEi6Hv+ZrPTM0jhIjTUDBkwWWpLb/1sQxhzSc7/LQerY\n7rjV21D3BpRw1gV6sldD3Je8eM0ILh6DMTUJtKwDz/iv3eLLND2TfnXz1+Ke\n57tVVe0N9kAYCxfrLf/mo66Vs/uo8dY/N4T3CgE3QL/zTqxmyK1jkWAazJS9\nEvknrtKe9ibNV+Gf3SzH8xbqu9YjIzaciCPyt7j14OB8yOWAx16jV7KO5kvL\nMsJJt0tI50nM5LWznmJB6aUFjQdxocVkoSOrBI8iwSSk9wfsKiEcvXypFro4\n45kI7yUwC7ek73jvmWIKh+o2LO9QgPKb4OPOwkRDB6m/SrEIWzKDEg4Tc451\nvGTi/4kExSo7Kx+0rUzIEv0KB2e3A9I1wjjzLZQckakpfJ0z9ge+j5WbIW+F\nic2GUtREJGXQ99rUDQPTHhrQbmwP4HEr6RpKWM8JKH6wNxF79payn3NoGR2B\nidA2\r\n=aSfr\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"media/icon.png","main":"./dist/mergeConflictMain","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","browser":"./dist/browser/mergeConflictMain","engines":{"vscode":"^1.5.0"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","repository":{"url":"https://github.com/microsoft/vscode.git","type":"git"},"contributes":{"menus":{"editor/title":[{"when":"mergeConflictsCount && mergeConflictsCount != 0","group":"navigation@1","command":"merge-conflict.previous"},{"when":"mergeConflictsCount && mergeConflictsCount != 0","group":"navigation@2","command":"merge-conflict.next"}],"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"icon":"$(arrow-down)","title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"icon":"$(arrow-up)","title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","capabilities":{"virtualWorkspaces":false,"untrustedWorkspaces":{"supported":true}},"_hasShrinkwrap":false,"readmeFilename":"README.md","activationEvents":["onStartupFinished"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.3e5faf69c14_1621559614355_0.3242622098679404","host":"s3://npm-registry-packages"}},"0.3.0-next.28767c88f0a":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.28767c88f0a","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.28767c88f0a","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"566a3a4411259c6f1ac44434a336b03353a0aa3e","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.28767c88f0a.tgz","fileCount":9,"integrity":"sha512-B1rSX1IFTW/RYmX8jMxfTRZFRqkYbhcauGi7IKaOFOjVwQygniRoMkdxI1SboqylnHK9y6ZyR8ccYEXeLGXUow==","signatures":[{"sig":"MEUCIQDbrV5EMfZaPtMzJJpM2sIosMExPK5wChcrSX7vzWOX1AIgFw5Ni8aXUFviQoafsZ2ic0sT1z76eV9AHrkKu4LVZKM=","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":140218,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.13\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJgqFrYCRA9TVsSAnZWagAAbEUP+wanLsWxbmZXv+a2qcJG\nCz9hscTlCzmN8pQ7zOztLVzPw0UaihhOjvDf4V6/gAKVrZqgculGTNaUPt7j\nMi/NURMJnYUyEnpjX+xTpycRr3n9J2UteWflydXe4ZlSVZhdrHiWdUSYBpKQ\nMpeZSor5u+KLZrRg4GcgiJ3j1MQuktmZKP/jCyyK9EeDYWfigtqkfxK/FNI/\nTCRVYTpeSgq3UzUOOz4FV4OsVpuNv0jTMrqInRhs4fNRGkTMLL3cXppAB+dF\nV1+tfEZw7SP+IaGOMsz8jJYV2+1+3jl1OaiOFw9Drgc8JyiUcjiaOXSh3LZv\nuVuwWoZsjQAliu7xQ3lqIV1lg3fwPhT+OCazXfL8+ivdARKqSphicxOiH45L\nqp8gQeESYVCmeqv+arH6e6XQPz/0MXQL4MHU3ZUT0CAwIP5Q6MqJbuqomWvq\n9+4ZgRSfVhpsX1hH5d2DW83+MuY+6rS3sukYsQyWgofT3ogsSEa7s9eGJ7mX\nqCyOb2ajA2zmjGS4rmCp6vb5QH8v8/JAFX+u6o9j5YxPq8GlERMnY+qcmGSV\nDd1ySTPlAqKsbTVPO2+5EotPbIOu3X4yPPUh0MhdKzYnkRNUP/33pLDN2/K1\nkYdDklQGU7k9qk5t3UHQUp8GXHvRZOrcFLbvliRKiUWx7UHOR2Qwx9CtuWGS\n9fL6\r\n=E20p\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"media/icon.png","main":"./dist/mergeConflictMain","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","browser":"./dist/browser/mergeConflictMain","engines":{"vscode":"^1.5.0"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","repository":{"url":"https://github.com/microsoft/vscode.git","type":"git"},"contributes":{"menus":{"editor/title":[{"when":"mergeConflictsCount && mergeConflictsCount != 0","group":"navigation@1","command":"merge-conflict.previous"},{"when":"mergeConflictsCount && mergeConflictsCount != 0","group":"navigation@2","command":"merge-conflict.next"}],"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"icon":"$(arrow-down)","title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"icon":"$(arrow-up)","title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","capabilities":{"virtualWorkspaces":false,"untrustedWorkspaces":{"supported":true}},"_hasShrinkwrap":false,"readmeFilename":"README.md","activationEvents":["onStartupFinished"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.28767c88f0a_1621646039676_0.10496781969486912","host":"s3://npm-registry-packages"}},"0.3.0-next.5319757634f":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.5319757634f","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.5319757634f","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"4b8f3d6bef5731403bc925682cbc49e5043a896f","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.5319757634f.tgz","fileCount":9,"integrity":"sha512-oye2ORGSUWMyTk2iXohXT4bLtYHL/U/NB+RLNojlhgyVrNrK8CQfzNga4Vn0ujbGgrHOT7GE4/kXztmjfkRABg==","signatures":[{"sig":"MEQCIDjJWnggkame8N1jtRBVSGMwxn9d/1WdU0Rvuh4rUeUZAiAy+YKVz6omle+uf9w9aWg248sSMCNbf9zcRHvXD95P7g==","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":140218,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.13\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJgqa43CRA9TVsSAnZWagAAGfwP/1EAVwMVIg+O4dq2cB5I\nTXjy9413c33S9w8QouoTZUREg06PiqN5/93EeGsHB9eISMhhqhSLth0Yse4I\nBK7f2PTRbE4OcxA15TZzj0p6D6f4p+jn9a7jMy45xYrkDxOelzGoawgo9SYH\nzZs0TfG13f/3l0Kjgm9LTmqjCW9uglC7oRrUxqEpzzNhOddxmm/rKx59G0Cg\n006XOFf2GNCOsrGDOdStAryZthdAOQCFKHnDxBKGIcTXeejFxdeQZqhK9JvB\nAvoqbY+RdFAasudW7A0zbvrwJPlMGIJo4BHGRrWw3sucbVfxy76dJeFp7O0F\nSytF/VK3Xssrv6KxS5YIQjkvu0TNp08w84rDm16oeya8C482qHj+FMF/Gu+d\ntkUG+CsNE17YEmK8Tc9qr9RqBUwLSMNr+lZWowB/Ea09SVFK/Bd/NwKsOzxa\ne33C2Iw+1j5uSXQzO3YxF2GnfW1RjOTPuEpywzKKUDImvQf3i1spOV3K4ulE\nMFdpajG6FY1MOpQXiO38l9gzyOB5DhvXnNmq3fDxlkgrCvd0M9SgP7du8NPp\niM07WXpztUW4kfQAw1EauV9pALKs/BJsZUV72h27BrZl9JQrnu7gPgNifpb6\nlLZsQ2nf38wZB9Gw3hgBblDDJhECayMXMj/3Qdzrnm3AopdPn6LBDGOWRrx0\nPigQ\r\n=KT0p\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"media/icon.png","main":"./dist/mergeConflictMain","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","browser":"./dist/browser/mergeConflictMain","engines":{"vscode":"^1.5.0"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","repository":{"url":"https://github.com/microsoft/vscode.git","type":"git"},"contributes":{"menus":{"editor/title":[{"when":"mergeConflictsCount && mergeConflictsCount != 0","group":"navigation@1","command":"merge-conflict.previous"},{"when":"mergeConflictsCount && mergeConflictsCount != 0","group":"navigation@2","command":"merge-conflict.next"}],"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"icon":"$(arrow-down)","title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"icon":"$(arrow-up)","title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","capabilities":{"virtualWorkspaces":false,"untrustedWorkspaces":{"supported":true}},"_hasShrinkwrap":false,"readmeFilename":"README.md","activationEvents":["onStartupFinished"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.5319757634f_1621732919403_0.7237676039334406","host":"s3://npm-registry-packages"}},"0.3.0-next.fe41fcc58d6":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.fe41fcc58d6","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.fe41fcc58d6","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"47dc8cbb90dbf08fc76bf435d853389d80934f8c","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.fe41fcc58d6.tgz","fileCount":9,"integrity":"sha512-/EraLPNiRmzBMWV30iip7n030K9hKpRJsbPxqIU63fugl8EiZ7zu+sHR+DLrXUUvdrAGyQA/Hm5JzC0ftAVpNA==","signatures":[{"sig":"MEUCIEXP2XRlAXJrwsIR631JhSMfx2GlB7BInkiYffZ5Bh0WAiEAryKTvhUxN4jqcpLePsfA/Td6kocXk2cjQ/Ha10U69HA=","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":140218,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.13\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJgrE/yCRA9TVsSAnZWagAAlgMP/3xijD74NH2mRp1Yv6l1\nuyu3z/1BzbLlB3lRUN+obc1Mk7bLvEh5nGBj4QrSOFTZ+jP7kh8dt6/DhZnQ\nLLYXtEC1Yv+RcDoHZ7Ak0KSDGOhckBcWtQnxqVNcRYWmo5BS6NZyTc4Jq2aG\nYcK7PW7XBAHLZNqkC554gV6iGX7pzdaO40OZHUvznRJwjnH4yh2i50JoFA0c\nZXuBUQulryE9C8oDefIyGLGrXrIypDA0dnwTY/hxiqPt3um1OAI+lN8qHRgv\nl32HqrVkv+A4IBKiFZ4TEjNHU8mRwZbr6xRE9de3P2+R6vBjrDRF/vADRYLx\n1Tu/Zpr57LQzuz4tigR1eCHy+OnFxCBY0EflLOVmmJZVZ1c9Ud1BwcZNAXSL\npjQqSqGmDf4aJalUMOW0s5XKjoAlKms9bEexA9wlWNuMDfkgbW/uy0nsfOEy\ndjzb4r7StLOQjRB46evNt7bNEDWhKMN+exzuMVf+/WVPgDIqFiCtXGQEsdc6\nFOoS+48NOinmxHWh7Rr10tpgEJNMDCZr+pnYOnNFr4w1rZWCwAFgDIRZC9qo\nln2YAg7m2jEJnxFYF8/HlXiWrFyQ7KIy/uE78K89LiW1AQTKqqViLScc1Ffi\nnKIBQJuNYYg7r1ryqBwfdRbXmwmUS65AMe0Wbc8WAXXOO4XzZ5gNzlb+5k7T\naz/t\r\n=Wv1G\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"media/icon.png","main":"./dist/mergeConflictMain","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","browser":"./dist/browser/mergeConflictMain","engines":{"vscode":"^1.5.0"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","repository":{"url":"https://github.com/microsoft/vscode.git","type":"git"},"contributes":{"menus":{"editor/title":[{"when":"mergeConflictsCount && mergeConflictsCount != 0","group":"navigation@1","command":"merge-conflict.previous"},{"when":"mergeConflictsCount && mergeConflictsCount != 0","group":"navigation@2","command":"merge-conflict.next"}],"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"icon":"$(arrow-down)","title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"icon":"$(arrow-up)","title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","capabilities":{"virtualWorkspaces":false,"untrustedWorkspaces":{"supported":true}},"_hasShrinkwrap":false,"readmeFilename":"README.md","activationEvents":["onStartupFinished"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.fe41fcc58d6_1621905393773_0.6950837643381924","host":"s3://npm-registry-packages"}},"0.3.0-next.7d50ce2061e":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.7d50ce2061e","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.7d50ce2061e","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"9d4193906e315680d261f9b781bccf8c9d230eb8","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.7d50ce2061e.tgz","fileCount":9,"integrity":"sha512-P2XpR3NPpDa+zZRXF997zUZE+CzO7B3IVInrH3Iq4E72QR3nWzFzWSLd/zoWbjzfggZ6uIsTpmlibyPe3bFGXA==","signatures":[{"sig":"MEUCIQDqzSpPOc3ZJpxqMcH1iN3zjwvcByNSfZz3WEFZCH+u7QIgUptjw/dwIrzqN1EEfTlzwu1vMSFj38tJsYBYV8t0KAc=","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":140218,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.13\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJgraQMCRA9TVsSAnZWagAAlJ0P+QCouCJlzcaXOVaELoY6\nr+eLNYtwTQ2F8VYxi5CwIstxTO9bcSQ8J+2APPwsLVuLdQIEJjEkZ8oWTsfx\n0GI8Qlyxhon+g6Wt3uHO9mTGmhwY37JMhiPrjHQ0+8lojdDM66xXAWf7OsWF\nBfWgJSTerb2WUDXbciBnikPQb2herXEP4yYrBY1bQudgwRnthgb3VXCiAeMq\nEUFyMzSXARKQ9UKgoUKWH/KwCGtESSH2B8AG4Kd1CGoQNTFNy5fbPQlreXwu\n2uzJJYPyQcofpP7JZRtiPXbB4leuoesAudptg7+J/ioNC6ShovEY+aDEd3jn\nM94NFrCVH6ZcMaii//OdhXqkps52VF15oziEDXYZ58z0OcSuehkD7+A9EgkW\np0OTrplJtkzhcFKoSm08ZX7EKWYpJEJc37AEzEhe3C/gRyDNCjbjtO8T4d65\n0p2thVQQmg46Rb4SN1Kt/cR4sBD7zOesHf9JLyTfdPSDu9N+Z4Akup+QqHjP\npFQ+j2Y0+xriMX5xlcc74nMrrOX+Aitcam7KBOvbpqbnPSSoobooJJ7+KyQz\nrShsova1etKbfTlkgPnevd2Kjhz14P/i6KqVulMPyyjH7ZTyoqKWhM1ctZ6K\nZo4pH6DPbAuXD3jl+6X4CXo33cBUw2Jg5qAHVAeG4nKHt5WdbvzMF4apvKnB\nfIZg\r\n=I0SI\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"media/icon.png","main":"./dist/mergeConflictMain","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","browser":"./dist/browser/mergeConflictMain","engines":{"vscode":"^1.5.0"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","repository":{"url":"https://github.com/microsoft/vscode.git","type":"git"},"contributes":{"menus":{"editor/title":[{"when":"mergeConflictsCount && mergeConflictsCount != 0","group":"navigation@1","command":"merge-conflict.previous"},{"when":"mergeConflictsCount && mergeConflictsCount != 0","group":"navigation@2","command":"merge-conflict.next"}],"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"icon":"$(arrow-down)","title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"icon":"$(arrow-up)","title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","capabilities":{"virtualWorkspaces":false,"untrustedWorkspaces":{"supported":true}},"_hasShrinkwrap":false,"readmeFilename":"README.md","activationEvents":["onStartupFinished"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.7d50ce2061e_1621992460343_0.8172301036215674","host":"s3://npm-registry-packages"}},"0.3.0-next.1fd2b4ed1e3":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.1fd2b4ed1e3","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.1fd2b4ed1e3","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"d1b4337d10ba0daa1661a71e7b45f8ed8445e1fc","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.1fd2b4ed1e3.tgz","fileCount":9,"integrity":"sha512-7hVBHmKp94RcgsWlkT2i/0VKHK98wc9tRJbTGpGuXYOZZPLD9VF8uH4HSHykeOQXt+C6nfaBk+s7hHCIv+/dPA==","signatures":[{"sig":"MEYCIQDYR+1NXr6dvFAQujOdcyuRx+rqWGixfr9viy2JpGsZkAIhAPkcbS6pr9D9GkD66taqz/oC0LsCGbgabKC5zoHBzsQI","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":140218,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.13\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJgrvc7CRA9TVsSAnZWagAAHtQP/izP7REwxlJwNff42+RS\nabKrIjiE+AhmV/761tuu6tlRDjFJGoNiAc/bOKh3YCATenNMa3CJgADTyNw0\nX9BRk9uCTjwbXjY0E+RxncLdF1pl5F3YLiT703hU5hZPKr+lamVpo72iszKF\nn4mve5l5edUL05aUbBFxTzC0j8KBJqjtoMmdHKn5ch/0HpL5YSzZasOew5da\ndKeo5KTKnTVudICVP2z2oZbcZp63eGDCvSztLOQlwiIy9VhXIfWiEZvX3kbQ\nN2nn+GZyd2bIBXJouP58hCvFdHEF0KISgbcBtXYDyTGwmtXdo8EBl3b0lYvx\n9caUu23DYQrtYhaFjxIoZ9zjJwWeRh9eQNcezFJs3uk+RJDq/VB9MxHs6ahT\nxiib3gXGZ2uy/+gcdex9jQb0EARmSdSL/o7X0UzU1G96cJyY8M8EZF7LnN2D\nCh6cVW3fSXA8oyLKAJo02/gXji+9KO64NwWi3ptUyTXjnZP3/gyV+hPus50d\nHYgIv/foEjI6lGpBe3JgR0WDL+uDnIGHtlMVkAeEp++3jfHneSVPBW6x6H/s\nF5J02hg2udNYvDP5RqVihnJFPbHCPceWSCOOCTS48Pluabyucwq5XflIcz3d\nrx+g0O5K2VoVXavZKPjw5rdwNxJ/ucuk4nWr+Hc1kNvyqOSCeyW2yt1bcZ/Q\nRJ2r\r\n=TcVZ\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"media/icon.png","main":"./dist/mergeConflictMain","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","browser":"./dist/browser/mergeConflictMain","engines":{"vscode":"^1.5.0"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","repository":{"url":"https://github.com/microsoft/vscode.git","type":"git"},"contributes":{"menus":{"editor/title":[{"when":"mergeConflictsCount && mergeConflictsCount != 0","group":"navigation@1","command":"merge-conflict.previous"},{"when":"mergeConflictsCount && mergeConflictsCount != 0","group":"navigation@2","command":"merge-conflict.next"}],"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"icon":"$(arrow-down)","title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"icon":"$(arrow-up)","title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","capabilities":{"virtualWorkspaces":false,"untrustedWorkspaces":{"supported":true}},"_hasShrinkwrap":false,"readmeFilename":"README.md","activationEvents":["onStartupFinished"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.1fd2b4ed1e3_1622079290576_0.10435489630986083","host":"s3://npm-registry-packages"}},"0.3.0-next.970858ef6dd":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.970858ef6dd","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.970858ef6dd","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"530ea6f404a1908bd4824b5e837f1bf5959a12a0","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.970858ef6dd.tgz","fileCount":9,"integrity":"sha512-ESQIpDAwzED1xLP0OloPFWG1JvIbUBPEKAU+IC84kKClsp6/RNPAV5qHvMAG8TGuWqIXUlYpqzRA8Ofn/AaC7Q==","signatures":[{"sig":"MEUCIQDTAEHAfW6M1mVYFM89//LvU0N1HTWV6YK09MDlkCVvRwIgFVSLdPwMQZj+0XHtnH2fap8c1DCCxQq4FsOE/CNLpfI=","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":140218,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.13\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJgsEvGCRA9TVsSAnZWagAAI90P/1yqdOl5T5es0PZpiAWp\nd97A8UQapZWBGNuYbpLIbHC+BFwqPOdmceHu0KIaZe2RniAEyuKX5vT6FU9I\n1wgULtxr/vSwmI2wxorPuEY6Im+NVtdjuPM1KzETn3H7ElW8PtyxG3ANWGu9\nClGoc+vFm7tbshUxN1x4HZYZNJaKo7Hvw2+s5I/chHJpwfcpu3ZsbVO0I0hf\no9/l8u8HhsAQyOPHspVaYYGW8ZHU/Ia/PFHSI5udPKKLFkUkp4u6vAG39h1X\nW2zupmlWIk5YnJDsnYzxx2FrviaNlluFcPRF/jmWqI2zBIXW1yRLQquJeK0j\nb778DbXsopwZBhTSGHh8eNlEiylDPREwOnPVE4FY9FamE+89bclDeDH23vDO\nhOlqgWW8Zq9RfMItC3osui6E2B/Ed8aVocfZG4hzZOmLad3TAYxHR6jNZn7h\nRFOUFpBwCgZyc8Y7IGBU7j9/z+Ejv4IVQ+8qm07mrjlJ4XD57FK51J5dJFy9\nlFd4cUqDBnkT/qAeXceWmDANBuZppbrtHxSRzZ0ZWto/VA0EGDmY5KSOHGOz\nK23FkNSzRqjK5UNhyqLAO/kLAd6jBsY1k5lb7KUsscGhXdRYwWiCJLe/tL6a\nzdCm7v7Al0OvcVD/XgIa0AluFn6WhDEFjuyAEK9LHE1Vp4n0i2Ut2Pb9vjWx\ndELb\r\n=htqm\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"media/icon.png","main":"./dist/mergeConflictMain","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","browser":"./dist/browser/mergeConflictMain","engines":{"vscode":"^1.5.0"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","repository":{"url":"https://github.com/microsoft/vscode.git","type":"git"},"contributes":{"menus":{"editor/title":[{"when":"mergeConflictsCount && mergeConflictsCount != 0","group":"navigation@1","command":"merge-conflict.previous"},{"when":"mergeConflictsCount && mergeConflictsCount != 0","group":"navigation@2","command":"merge-conflict.next"}],"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"icon":"$(arrow-down)","title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"icon":"$(arrow-up)","title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","capabilities":{"virtualWorkspaces":false,"untrustedWorkspaces":{"supported":true}},"_hasShrinkwrap":false,"readmeFilename":"README.md","activationEvents":["onStartupFinished"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.970858ef6dd_1622166469929_0.7866045524549985","host":"s3://npm-registry-packages"}},"0.3.0-next.b0862e99074":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.b0862e99074","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.b0862e99074","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"ee14d371071b2ac4b4ab0b93d5630a2d08fa73f0","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.b0862e99074.tgz","fileCount":11,"integrity":"sha512-/escQjz0EWZjQkyV551yZjIlIgL+WIt3xA6JcwbAeTRpkY8S24WHwwG2QwiHyu0/RB4Vkar3Z6Y1cty1cOIiMw==","signatures":[{"sig":"MEUCIQCzw8B7YEXdsmAS6WdRE1dbhBUCc0489WgstgCMm/qmDQIgQZxwqI6C9fxHJOwqGIgW4DVlBBJaDo+kfxUYZ83FTQk=","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":107439,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.13\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJgsaDWCRA9TVsSAnZWagAAb4QP/jMxDjv9HywoDwQ/7IsY\n6xcm2IW2npB9RESe9k7CHiMN5ciVdwYiisfKpQ30yb/AWUhALiHGZT/2uiDj\nSNpYNMuBC2C1ZjSH4+NzoUjSoKSJPMPyKvritPuINVpDRmVhZmbHNDcVWmC3\nk7MvvUSz6zP+L0W3xaTzWDu/5+Ic8lRAcvMilzPi9ZvinhUfpaEce3FNGCH3\nDQiF9ocMclU1WzFFB/DpYLfeO4zI+Py6S2hgX1MKQTtZg1j1SutSBbe4JwtW\nS/6ofx+95RLBAsb9HChpX9JtcZa82JsLRp2ZfNLTecsShvXkVyTZ2XjB5w8p\ncSVYJ4vGZGjLaYzEsTYdbY6+dzbRB+y4056gr3nWWYRIRQgKPZTD6VwS6/qS\nmRshrs7EzDmpmSR6mSn/lk6eu3fsO/aEIr9wWe2Xvt/+LhNjQ72B2wGr9+ur\nbtYb/qXkNEUTyaVoUqhkGdqTt5m0Ww4AtH6kucGBO0LPzuzcy/G6E1Fn3B51\nxEiLvQE3QXvUeIYUMN9mPaqssXkY2Gxry/EexPeosf7aXCeKIQkhss4tAFLE\nR1hh6MZpSFoDk3JYYpng992xGD51j3goGbcu3rBy95FrZmoWWx65roY6MebM\nOoBvQYUIMd6MZkEat69HQ7VZQyQYerEGmohDfA7OCIqDAny6VyMzHKUJTMDN\na6Fc\r\n=U68Z\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"media/icon.png","main":"./dist/mergeConflictMain","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","browser":"./dist/browser/mergeConflictMain","engines":{"vscode":"^1.5.0"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","repository":{"url":"https://github.com/microsoft/vscode.git","type":"git"},"contributes":{"menus":{"editor/title":[{"when":"mergeConflictsCount && mergeConflictsCount != 0","group":"navigation@1","command":"merge-conflict.previous"},{"when":"mergeConflictsCount && mergeConflictsCount != 0","group":"navigation@2","command":"merge-conflict.next"}],"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"icon":"$(arrow-down)","title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"icon":"$(arrow-up)","title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","capabilities":{"virtualWorkspaces":false,"untrustedWorkspaces":{"supported":true}},"_hasShrinkwrap":false,"readmeFilename":"README.md","activationEvents":["onStartupFinished"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.b0862e99074_1622253782335_0.5627440945976663","host":"s3://npm-registry-packages"}},"0.3.0-next.667e3dd844a":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.667e3dd844a","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.667e3dd844a","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"6ee75bc78aaa510e472d1f501ad526b55b1a8b48","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.667e3dd844a.tgz","fileCount":11,"integrity":"sha512-8qR62r0gUgurZNrP4stLIW3W3xy/k3SvfoavDzTJrpiSLSZRSVW2a/qkpBQ/vhbD24rT/eTKBNzx2Nhh6eQDVQ==","signatures":[{"sig":"MEQCIEUQyFyC1gZoHTTMW2elL1dgjFX7jXyjGWwNKpCof5EEAiAya6Ehbi6sYS2SnunQnIleJAxVMohk5xdMxG5rxd4PmQ==","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":107439,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.13\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJgsvThCRA9TVsSAnZWagAATnwP/iHnlGQsdAZJS8KxwKYK\neYawrL4tNM3amrB92YZknwy/08GqO0h5xpT73raaZFVYk0Lf+vgWTtlUPTLT\n4JJPEhMzlSX7XxEWSAPnAedc60F8YD3RAKux6NFTQ0dfyDuwaHcAoAJiHThz\nCn66w6Dna6omylQP0RP25VfkUevijg+UfNkwGqOT9YHOYHYHyQ8P5C3Ee9TJ\nc5kvDsZWec9fblAL/DF7Dn7tEidOu1O+KGxVmap+SLWR7qWZj0cgINblZ74E\n0toDxKfKC+qL5x7vWY1klImXinPBQ1/CYuo1CfFJMQu6Rjt2IFsoilmkcPhV\nd7N2xSEcyUbT13xVTnCtbzropEYVfjOTlIfs2Mqhongskun0VtmcNyYFGdWU\nQYUtc48QdydvAZgEtdJpZ9OoAtD31bNmsNxtAVjt3mE5QMWBKEGImORw+eSm\nLDfkJLxk6e2MpMWr8rmIyNmr5zz1SioJcMmNewYY20iw35oXZznzvCvziUTR\nj12ExAUPZOndstRBVEXGU9aNnIq/TMGhq+j6U9jgxh61AHfQZs+s719/vhhm\neNgsqtOMqmOgII4Z2qLiU4N1EeD8i4shxg4HjqRGMFbcMWC9UdA6bf2pOQ1n\nemIcsDnNuj8LrKqSm19cztOeYhds0sBG/dNnzE+wrgRcaNji5PpaPU85ldH/\nekBu\r\n=iujc\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"media/icon.png","main":"./dist/mergeConflictMain","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","browser":"./dist/browser/mergeConflictMain","engines":{"vscode":"^1.5.0"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","repository":{"url":"https://github.com/microsoft/vscode.git","type":"git"},"contributes":{"menus":{"editor/title":[{"when":"mergeConflictsCount && mergeConflictsCount != 0","group":"navigation@1","command":"merge-conflict.previous"},{"when":"mergeConflictsCount && mergeConflictsCount != 0","group":"navigation@2","command":"merge-conflict.next"}],"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"icon":"$(arrow-down)","title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"icon":"$(arrow-up)","title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","capabilities":{"virtualWorkspaces":false,"untrustedWorkspaces":{"supported":true}},"_hasShrinkwrap":false,"readmeFilename":"README.md","activationEvents":["onStartupFinished"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.667e3dd844a_1622340833078_0.8525618152918715","host":"s3://npm-registry-packages"}},"0.3.0-next.4f3d865a6b4":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.4f3d865a6b4","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.4f3d865a6b4","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"abca37ccef3f6e9cfa5e610d21666b04887ee995","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.4f3d865a6b4.tgz","fileCount":11,"integrity":"sha512-NLFE/AxNei/jLNGWm/csfJ98E4eeLBnfUpPJc4+8zDYbFBTSSRPK0kQd2xpHLg0gzqHI3wrZzusy/48kztCnRQ==","signatures":[{"sig":"MEQCIDyctBtxLIKeGbtvdKu+hBuLhke0ajtoWFD4nlFYPeGwAiALXyIXxI4ZgBShvP9C8tNmqw2drMv97yV7X8UsqKKOmA==","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":107439,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.13\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJgtEipCRA9TVsSAnZWagAAzNwP/0XYUz/WjPwd4poDHRAH\nJOnBlDTCWCmKYIFWLInIcrAvC4n7aWlWMnPdySU2b8Bf+4f2qMaCq/GKVtDJ\n6iOpA//AUwJijIBRHGDE5yVCkiKavXUhL5H9GCWBXk7woBDpLj35Y4nS1Ab1\nIwNCYsDrJiqAed9gRXbNlIZgTtQDMBl9r6siF76mdbCMXbIf7jCa0tsWsR8P\nKIRe+ag3JnpOnvLCNFH/0X3sKkxAiVCk2zhT6O+8ZflGLz++VHCPM/nNm+pQ\nbkGAq/cFr4jsw834HVXbiKF6qxhFlHAwr8abL72Lam6yX9HN7ZW2bGN5zn4G\nimUxKuM0MRncrONdYETNHtvBuSSpEQuNncXYl+FfC50k+WHRkYSYomiIFE++\n4yHIiz6h0K5BKBD7rF48lYMGKbA0idHeasrD1ybqtm7o3ynelRi5yrPl41SF\nQZ5NQLXO+CQaZCwL5cTF1/WzLQgd/gtoZMc1/1WUweCsWuQSS4+zar0UAUI4\nHNMXMYa+hAb1ozWoKaSrvBAW9QDqnTS5xGyvoztPXoRsASUeo0ySeWhhKRvP\nkh0kjQWrPzh8BAPAHE+AMzVf02n/QztaQdXTON75m+1EYUJcICanN8Mkq9Fy\nheArL/CP+Uta2xCsgKqFsy5ZPA2QOjOiWCGhOFMiQgu26VAyKc9g/z9U/F4Y\nHC5o\r\n=27NU\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"media/icon.png","main":"./dist/mergeConflictMain","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","browser":"./dist/browser/mergeConflictMain","engines":{"vscode":"^1.5.0"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","repository":{"url":"https://github.com/microsoft/vscode.git","type":"git"},"contributes":{"menus":{"editor/title":[{"when":"mergeConflictsCount && mergeConflictsCount != 0","group":"navigation@1","command":"merge-conflict.previous"},{"when":"mergeConflictsCount && mergeConflictsCount != 0","group":"navigation@2","command":"merge-conflict.next"}],"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"icon":"$(arrow-down)","title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"icon":"$(arrow-up)","title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","capabilities":{"virtualWorkspaces":false,"untrustedWorkspaces":{"supported":true}},"_hasShrinkwrap":false,"readmeFilename":"README.md","activationEvents":["onStartupFinished"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.4f3d865a6b4_1622427817030_0.1434709524452571","host":"s3://npm-registry-packages"}},"0.3.0-next.1e446dfadf5":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.1e446dfadf5","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.1e446dfadf5","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"94430b536044fda098cc0bcc09342b002a2884dd","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.1e446dfadf5.tgz","fileCount":11,"integrity":"sha512-OlmH73S5Q8NG+YAib3X1MUmuIxJGhOKJ4EMjcaPQuYkQsPnPc4UR0OUcwZYvBGA9Es1zGTBYun0FPAkopaghBQ==","signatures":[{"sig":"MEYCIQDyQKy4awtmU3W+mh39Wm5iI4sgNHa3C0a2GR0Jodn+gQIhAOrLmArm+nqH61TfNNmmUsHUi3/XvaiVdH+qq6Tr0A5f","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":107439,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.13\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJgtZ/UCRA9TVsSAnZWagAApWUP/0oa7stBa4lqKbfCInUP\nqI+Z17iEq7gvSxxF2TgDegY3JTHUdfUDzdsb5qiLrTOhNOcUZor3IWXK/fIR\nWhopW1qDCNac70G0Y5H9KLxbZY8RMjaYjh97DdDvVQ7hYGAuK9ICqDvlDlKd\npgDwmHBeKdKIlPNpArauTV3VhGZzDce/AOnYQU/ab4p26gGgZ9KoyUb3HdWf\nxgFqFQh+5R7jhfWE4faZk1qBNEG1MWE5qL8FdhAAfCFKgi9n8+YZFZms6/fz\n2lEAJ7viN8LDrTkc5IJwuVx/2R9EtDtbVcr49kjFq0cJowP9vhG9gOWIgkd0\nTIs4zfz+XvIVZ5xAdZIc8Q5T2XSTYVtO+cpqvxziO8xnstlpDZm2IBQnhHDR\nBt3PVzrcmPj6OcVXMtQyr7hXD+WElWWqZYB5vNAw5TCVQwhQl+8OJXv/Rvdu\n5VZloE3a4tjghLFxc0NsNw3EE4fSfui+wbjcgIcT/40fX/BgGZUSb1jYwkoM\nlf4VwbLO4yQpFLCxiAxJMEKztZa1vo9MGrSC/wosFWqSUse0BweLkao6yS91\n+Ja0XdueLn/IBnCqk+BFkoiyDU6TxVqP3VF2n3Yg3lrOxAJfF8zJDy6dHPy4\nFyemwDXbmEqriXeyrQQnGkijYJX8rWG5JfZBN/9CeV4EEL2uzYlsfyCi2vzW\nzcxI\r\n=mcwf\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"media/icon.png","main":"./dist/mergeConflictMain","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","browser":"./dist/browser/mergeConflictMain","engines":{"vscode":"^1.5.0"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","repository":{"url":"https://github.com/microsoft/vscode.git","type":"git"},"contributes":{"menus":{"editor/title":[{"when":"mergeConflictsCount && mergeConflictsCount != 0","group":"navigation@1","command":"merge-conflict.previous"},{"when":"mergeConflictsCount && mergeConflictsCount != 0","group":"navigation@2","command":"merge-conflict.next"}],"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"icon":"$(arrow-down)","title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"icon":"$(arrow-up)","title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","capabilities":{"virtualWorkspaces":false,"untrustedWorkspaces":{"supported":true}},"_hasShrinkwrap":false,"readmeFilename":"README.md","activationEvents":["onStartupFinished"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.1e446dfadf5_1622515667671_0.6801953682262556","host":"s3://npm-registry-packages"}},"0.3.0-next.b154a3d3043":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.b154a3d3043","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.b154a3d3043","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"30f0291773c400363ea0d359e0951b26163e26c2","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.b154a3d3043.tgz","fileCount":11,"integrity":"sha512-vPONA4PJdHWrx1Bo44DNTHyCREhIk+ogo6zujkKy8bkyAm9+IFJ5G3ts2TWBBHwz6b9EegvvSY9pjicV2qs7nQ==","signatures":[{"sig":"MEUCIEETZiADpfhQOphTPxZ5ahpaJ+u4vO+Y9aenB6V9YG8ZAiEAvUmEUSwWUMN04KDYOQbShf3gcGoWIqtalhzAuwCArLg=","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":107439,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.13\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJgtvI4CRA9TVsSAnZWagAAoGUP/2z9RbsWn83RNccgKy/V\nRnK3bDrdsOVN6lHTqeMhIpNfEAWvT7QvlG/skPjTqaZ6uY6lNillsLwL4tpP\nXkgB7rBSIygtZfKDaXHUsk3GEHkD44E4gdZhFSzxRd2lK6s11hfkNCo8iV3p\nhW0V0+liXtP28AoT5cyrBvCxqWcpjr3LHp+PaJwjHFS3hRne1vUFgsaY2wCA\nKSkZ2HtoCiXIRE0HgA1EUIbD4QqFrUqY/ZG+uIf2Cb/u70mxQIJbufOuKSUs\nTLS43UJOehVpTnnF8rCS0yLBtLQnLbkvx10zRJwYLdN1/xOnPa9LZvv1zlvl\nW7hnYZH51W3rvhkLQvuf32eZc5JvYmc153btA/pCxXsrkxv2aq/ROjF0HbEw\n9i9FCO+jg3/Omm52OM0HlveyJxFpIEjQau4do+cVM8zqM3N5sk6X2M9hrA+6\nuVww2zUnDuJuLwD8/wc1+uVg67cZRhoBkOgpwq0Y32l18kQ1EAlWcdGs3RSc\ngoUPWF8uAsDXcVaYjh+iE9uU97zkEc8fXMVfB/MQcLEATrBmvAdimw/FVnuh\npMovTH4aKGVi1shh7RUt1rpVa3tKgRmhme2AO2/6cGuV59l9JcI+/BTnsHO+\nBdEWFKcWDeCkXsXtWzSwYdyAqsPKmp0la00ZyzMLggIsKI07P/1AmeP4+IDJ\nnVXO\r\n=QCSm\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"media/icon.png","main":"./dist/mergeConflictMain","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","browser":"./dist/browser/mergeConflictMain","engines":{"vscode":"^1.5.0"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","repository":{"url":"https://github.com/microsoft/vscode.git","type":"git"},"contributes":{"menus":{"editor/title":[{"when":"mergeConflictsCount && mergeConflictsCount != 0","group":"navigation@1","command":"merge-conflict.previous"},{"when":"mergeConflictsCount && mergeConflictsCount != 0","group":"navigation@2","command":"merge-conflict.next"}],"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"icon":"$(arrow-down)","title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"icon":"$(arrow-up)","title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","capabilities":{"virtualWorkspaces":false,"untrustedWorkspaces":{"supported":true}},"_hasShrinkwrap":false,"readmeFilename":"README.md","activationEvents":["onStartupFinished"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.b154a3d3043_1622602296500_0.4100319657644853","host":"s3://npm-registry-packages"}},"0.3.0-next.b2a64b1379c":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.b2a64b1379c","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.b2a64b1379c","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"a9909c18ebeb78e56b4583a6c91837f3db69041c","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.b2a64b1379c.tgz","fileCount":11,"integrity":"sha512-HeSkKP0DxVQ6R++f3pKEYqEzGUVcILyrZk5AKG8ao9wIjwLedy/c1e9yubYeg6iCNA4AM89bSZTDPjEP1s/a+w==","signatures":[{"sig":"MEQCICNJ2bW/d430MdfUYaOsZOv91AODKiz12ksGxrlyo5WDAiA2fy9SbKR3frlhL0/ciTcMYrCVRjhHDiV68DCW9dA8EA==","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":107439,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.13\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJguD5ICRA9TVsSAnZWagAA24AP/ROgWWnSj9ua3SvGBoDZ\njv6bZeiumwP8XToCHHZGqk7WLXodOLNkQp8Q7OwY9zxXfnAFwoWzswA9e99u\nPlPHL+7XXPCJwodi4bT56Tfv9kEiHHUwYJy0lZCRpiygB/4GHoGKYPL3Z7A3\nnruOqw2Ds6WJ6ZGoEoWY3ekPkN+Z0CfT0WJt4XL2KpE3FcM87/sDBIN5LWi2\ny9N9iPY9S9J4l+1MOQlFnd0sqfwVicAqmJvAZUuNGwI0x+LK95lIqrlaecyM\ngc6OldhZpPRgu20L7PaxEoyp2rnR+gkDyF/XMm9yMdnbLkY7kNfD1Af1l1Bm\nR8etvLlytFY/CaogbCq56iJP62ZvuolCh6QTgv6D8Bsc14JbVsq5PMrCCxji\nqsnXx3/yuxo4IZibnxv0eRXujQyOI7rFjktNfjBIwqHw6yRI+uJymByU8CpZ\nI8yQZEdwWjs2Qm2W2Oc4zvcxgsfHAbIDDW2rjw6l7qat0R+gRK0WaYdyzwyy\n1U4ZnvAYdtlS61qyJf1r0YVWSqBt1MEg7F8bmSdHs4bnGgijierhuWKjZRkG\nuS5jHkMoPUz4/MhUyYVtCDo0gOifpUBbdXoB2ltNDxIj7uvjJD2sWl6fVq+w\nxibgRBc0R+Xcvlr9Cu4RHjRWfmpkXEhUIFiLs7IRMSgLiFmA+VjVbLLvvfx2\nVyG9\r\n=6Ili\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"media/icon.png","main":"./dist/mergeConflictMain","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","browser":"./dist/browser/mergeConflictMain","engines":{"vscode":"^1.5.0"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","repository":{"url":"https://github.com/microsoft/vscode.git","type":"git"},"contributes":{"menus":{"editor/title":[{"when":"mergeConflictsCount && mergeConflictsCount != 0","group":"navigation@1","command":"merge-conflict.previous"},{"when":"mergeConflictsCount && mergeConflictsCount != 0","group":"navigation@2","command":"merge-conflict.next"}],"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"icon":"$(arrow-down)","title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"icon":"$(arrow-up)","title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","capabilities":{"virtualWorkspaces":false,"untrustedWorkspaces":{"supported":true}},"_hasShrinkwrap":false,"readmeFilename":"README.md","activationEvents":["onStartupFinished"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.b2a64b1379c_1622687304702_0.6785954153240987","host":"s3://npm-registry-packages"}},"0.3.0-next.fd2ed91612c":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.fd2ed91612c","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.fd2ed91612c","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"553d0f1dc1513fa887dbfe4257fba53323574c33","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.fd2ed91612c.tgz","fileCount":11,"integrity":"sha512-rtN9svOejhdf+GnKfHLjIY7O4pZwCQM9PX1+PWlwPTB0s7KNRs138wAzgpLmS6GuXqiJuwJS1OsVaUyR8TRDuw==","signatures":[{"sig":"MEUCIEFuuqd/VYZ+s9z3SFZBM/MAzcb4fH0WeX3rX7pl26mDAiEAgNK/iz6qFNQcco6iZEqsAnp8lUjeqyofBHZKvgLmeSM=","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":107439,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.13\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJguYlRCRA9TVsSAnZWagAA3GAP/1MIsXcCHl/1YIrfErcK\nOcb24jo1EzM7kd/rtyAICYs4pEH9UTSpj1A/XBAIf/ZqcT3ZoD4vEnt7cL2V\nGe72PQCHYdKZeWvzUOpLvppjdkAiidnLRukeHsQ5CMhTDHqpLu0pzZ1im+3o\nvfrOwTR+n68oX/FMzepNhqSQgUSvt3HzW/Nifs7GHxAy3dYVjRl8whIaE7qv\nnOPDakhxXZ2/H/ABtbZrlymMoWzKUmP4xUwmr3WPizL2h85xSdiQ06T2nzeE\nPiZRvNcprsN4npXeIGM0VXZX3xigXz5IN0RjoHXn3qGBJ5jwFFOW2fB5ulTw\nVyoizGNdFBeeo4mA2P0MoanG3/QHpk45owAyhFRc5Ue2jS5MTC2Zsl9FlVFI\naqkTAhzJRfagLjM4QA8+rjgptrFhfDtYe7tb0gv6dGTSoGE8IyDRCqkEIOKo\n37MelsSKam9g8AY15woZQY+Cg3XJyoLmiTYCmZeCVdvNaSORLxI07hcPzSlL\nlR1ojZy5xtzKI8mMfxEV89Os2Hohh6NxaaaHvspvpxwoSSjpO/I03hlNi3r2\nxv4/GGlFP35xQBv9WFuKZE3PHFyrUSU0noQILvMsz4zF/U2OoW7ZkizcBBFO\ns+budkDzygzNI/MW/1F/Ht2Lc0s6pIydnKMu2/lYDs/s2FMxyL0p2ZV2VZir\nVxZM\r\n=TpAy\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"media/icon.png","main":"./dist/mergeConflictMain","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","browser":"./dist/browser/mergeConflictMain","engines":{"vscode":"^1.5.0"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","repository":{"url":"https://github.com/microsoft/vscode.git","type":"git"},"contributes":{"menus":{"editor/title":[{"when":"mergeConflictsCount && mergeConflictsCount != 0","group":"navigation@1","command":"merge-conflict.previous"},{"when":"mergeConflictsCount && mergeConflictsCount != 0","group":"navigation@2","command":"merge-conflict.next"}],"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"icon":"$(arrow-down)","title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"icon":"$(arrow-up)","title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","capabilities":{"virtualWorkspaces":false,"untrustedWorkspaces":{"supported":true}},"_hasShrinkwrap":false,"readmeFilename":"README.md","activationEvents":["onStartupFinished"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.fd2ed91612c_1622772049580_0.4874240994031098","host":"s3://npm-registry-packages"}},"0.3.0-next.ea277806340":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.ea277806340","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.ea277806340","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"3d48dcb779cac49898f2410d389166db8243dec1","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.ea277806340.tgz","fileCount":11,"integrity":"sha512-pqdGYFStoj6n30MUodOOnYuj4CHj+7Yf+5t9svt+eg2Bh9IIPH+yiZ+kc1gWDYORdXnPtf/BptQktYpPvQnH6A==","signatures":[{"sig":"MEQCIBjnOAywlpi4xn/zkjQIMivPM1NNPDoLFfRLHb25CJbyAiBAltZSdO941auOWtdEhH2iV+KKyerbAa0AN5EfxHoQ8w==","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":107439,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.13\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJgutWFCRA9TVsSAnZWagAAVjEQAJqn51c4JjQTYYO9bP/f\nfcvVig+//918S6Ij++vARSigtrCPon7sKsUXp0/qYl7E8mPRSxX5ABev7VG+\nLnn44bjGOvsEFHmAOJ55L4X1OGtMK0TdkXuwwlStoCPFYjvtsj87Knko3P3i\ndWJ7YWCXuyaAsik6yIMJq3SKgwo313gNs4MhMDyiuLtoEZg+RdooI8yKisef\nOWpMAHZbuBPYzuA9FYFlLqbLX4oHygEXtrycMwI9XXqblkHTx97vN7nIO/Cf\n+AEALlebNwmPSdeeA5k9qoShXKfHbiuKHhM3BB1LGM0anotVXdgBJXRz/jty\nzoZwwfYIh0BB7hOMjCQeUJCmAOyp7IQ/Pj/ToHF5GEUTLSfTgZUs8ce1ERn8\nGQ4wTZ932bc9vHhC2Fun37ZKcPtfNisaqx5IqvvKY1EKquUkMi1Ggv4o9TES\nmN4VVoULW587fHas0xdiJS/XjFGL6eHS44PGTpSqDGFxEMUNuXthMaRvovMI\nSADyoAb701gna1Ck2zPKarkQbhmrYT5VTIla0iM8VtNYv2bVpT0t4SDdCDv9\ncLJgbr21fuJIMbOfO8eNls4YydbD1TSwune2+KRMGKeDNaJmI+BjRXUwpiCP\nAgCxj0/t5nrbLoIY8HudgfEDgArXB/QdQwJbENT4g0Y1C6iLJKtNHa9itS+q\nLvlc\r\n=hcv5\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"media/icon.png","main":"./dist/mergeConflictMain","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","browser":"./dist/browser/mergeConflictMain","engines":{"vscode":"^1.5.0"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","repository":{"url":"https://github.com/microsoft/vscode.git","type":"git"},"contributes":{"menus":{"editor/title":[{"when":"mergeConflictsCount && mergeConflictsCount != 0","group":"navigation@1","command":"merge-conflict.previous"},{"when":"mergeConflictsCount && mergeConflictsCount != 0","group":"navigation@2","command":"merge-conflict.next"}],"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"icon":"$(arrow-down)","title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"icon":"$(arrow-up)","title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","capabilities":{"virtualWorkspaces":false,"untrustedWorkspaces":{"supported":true}},"_hasShrinkwrap":false,"readmeFilename":"README.md","activationEvents":["onStartupFinished"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.ea277806340_1622857093753_0.7395440839344447","host":"s3://npm-registry-packages"}},"0.3.0-next.da65c670632":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.da65c670632","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.da65c670632","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"648db510124719a591699d75ea01da922aa78e6d","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.da65c670632.tgz","fileCount":11,"integrity":"sha512-TUiodjY0F8vDjQ/4IhDaLeGq7f/qZxhrZJnsDb1CVeTs/KnR9a5f1Ru6M05beSQLEZxyre4kyIhF424obYkSDQ==","signatures":[{"sig":"MEUCIQC4knggCLTrFG88ftMyeG43S1VZU3vz8X8FnXEKMq/UHQIgZXs9n0oFtC4HvCsIEM7hZhAmxWbtzWktIctgUyd7Cd8=","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":107439,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.13\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJgvCVoCRA9TVsSAnZWagAAcfYP/ArO3IUeGrx8gx+BJHYD\nJSmCShBFrCqNOJVgSxEK2UOWIV1US2KozuJ5CEaewzBGilXkN4H/B+BDE7BW\nz+BaiCJ3z3PiEWdgVSS+yM4lnGsYMJq01Uc3x/n7qi02unh5lW415lArMGCx\nddkbhCb3WMw6Ij+A7mpfHzNchI2kNSBIMXCuSnmPamiQux3XyfjLvPi9AjHJ\nTmDpxS9J6lDVAHJmi5Fess1YFniXgeSXidpMz206MsSB2+5mmL3wgnf/rPfr\nFsHuJrQi3J092f0+oy6E8xoCLKkSK51Jsz1Yz46WIo3Ghf4d8JmkKqPtiLGM\nQEYzrWP8TK0BUNMEknK3Fbr+yXhaui3LZnjdMPRjbUaf+hQnEAEoExr2bhtK\nFqGi/WAoApJPQX7gDPbEHLp5/F73moeTXEHOuV2O3TCNsCfjP8rZvihpxxCC\nX1e2+gj1kAJ0rby04y+4CjjA689Co3M1f0KYUuOCAKmaH8FcfvGjRpR3zcVI\nJq+DFbtRS45vqCu0WttZ6VhzLIhqau3rT2yEGm4LK1ARWRCcY+nGvd3eJnYg\nwRggbtGk9Z1MNOlEuJTtDDRNIN3er24a1mGDRzqmkL5SDSnVlLXZjthTCpVh\n6GT9+pzm1Rs8CtP7X692cnnznaQ6Tybu6OsuMXiy1IZt99pX9MMnqX3dxjWp\ndGJh\r\n=okQH\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"media/icon.png","main":"./dist/mergeConflictMain","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","browser":"./dist/browser/mergeConflictMain","engines":{"vscode":"^1.5.0"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","repository":{"url":"https://github.com/microsoft/vscode.git","type":"git"},"contributes":{"menus":{"editor/title":[{"when":"mergeConflictsCount && mergeConflictsCount != 0","group":"navigation@1","command":"merge-conflict.previous"},{"when":"mergeConflictsCount && mergeConflictsCount != 0","group":"navigation@2","command":"merge-conflict.next"}],"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"icon":"$(arrow-down)","title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"icon":"$(arrow-up)","title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","capabilities":{"virtualWorkspaces":false,"untrustedWorkspaces":{"supported":true}},"_hasShrinkwrap":false,"readmeFilename":"README.md","activationEvents":["onStartupFinished"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.da65c670632_1622943080533_0.475575819772184","host":"s3://npm-registry-packages"}},"0.3.0-next.3b01e32ca63":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.3b01e32ca63","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.3b01e32ca63","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"94ff30e9097c6804bde8ef612e676667100dc437","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.3b01e32ca63.tgz","fileCount":11,"integrity":"sha512-I2jlxKAQ19NAMTTINXFykKLDYssh+THdN0GYXkRf8YGlkPYfdb1v7MGroBxB/Fsb+709JPyAWuvHKHTRiVg+pQ==","signatures":[{"sig":"MEUCICBtx9N6IHfpYmOdCTpdcdyZOWKtC7LzyZVi3UtP4IrDAiEA+EXYmVf5yAFjxZfQ/eWMu0epDg4fPFxVZHFr5RJip2s=","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":107439,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.13\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJgvsg0CRA9TVsSAnZWagAAMpkP/1ll2QRG5z37m76sOmyu\n+xLVNB+6ieOykksTi5nvnWV7zmIxI9mi06qIyL//Pn6vvKo3/4czA81o4l0a\nH8ZdRJf32DVVkwerDJqODbX6s0mkwaqCMI5gtCyvuVi3uc22aEYlWfMWTkTL\n2os//NEC82k+rZRyag35BbS0ZMgNr2XjJQe/MxXyLeXhpsBEvk5FWGLIdzYo\n93Ah4Mj711qQceHY0F/E8cUp6apw4Qo67hB3Y8mjmmiqMkESRHmrnesCQmcD\naL1x+92s8DR3NT48uDcBqzntwcQFTeOXDlFw9qEc+/W9u59SX2voYR0slnLW\n+AdApgcdl0S/ZDAX1Yn+39ba7jzn72e6ic92CecSTCo0sBPJFkj2N5XxB97F\ngLJr0FUmFui0mXNRPO1VApSH1sWqrHI9wS3a3OzQ8hHzJ/NaLyiW4NZ66EWE\nfzw4pOXD7o+b534Jx5zZT3HMUnt3jxhhgL3d8FtI1THJ7+bCgaK/VkKRwFls\nxad3MHw9IpRq50+pjAF7oXlqUg93Ir4gOyL3/dcTcwyWHUvAQySt6cX9g33b\n5sUDHaVflPSY8te/97fPKzcKHROsICeZ9uk5aybslCdrfgvp0vlxWC+1gIWs\nE2wvJatBndT4IQrwZ0QE/xdgdBeTu8ufvsC6epiwa7IgqrVWwjAzP9rBAxEl\nUFaB\r\n=EI4X\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"media/icon.png","main":"./dist/mergeConflictMain","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","browser":"./dist/browser/mergeConflictMain","engines":{"vscode":"^1.5.0"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","repository":{"url":"https://github.com/microsoft/vscode.git","type":"git"},"contributes":{"menus":{"editor/title":[{"when":"mergeConflictsCount && mergeConflictsCount != 0","group":"navigation@1","command":"merge-conflict.previous"},{"when":"mergeConflictsCount && mergeConflictsCount != 0","group":"navigation@2","command":"merge-conflict.next"}],"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"icon":"$(arrow-down)","title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"icon":"$(arrow-up)","title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","capabilities":{"virtualWorkspaces":false,"untrustedWorkspaces":{"supported":true}},"_hasShrinkwrap":false,"readmeFilename":"README.md","activationEvents":["onStartupFinished"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.3b01e32ca63_1623115828220_0.6465555357957951","host":"s3://npm-registry-packages"}},"0.3.0-next.6987abd16ed":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.6987abd16ed","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.6987abd16ed","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"3fdd89a36542ad800b4aa745b47649f0dc827e04","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.6987abd16ed.tgz","fileCount":11,"integrity":"sha512-Xxq4HWsXXkN/UF+clPrfUfbkav3BWiKhegjTccX5fqS/xwUukrvA65mwOr9aeaHNRahx25H6X0K3r+n3nW2xLw==","signatures":[{"sig":"MEUCIGijsVGc7I9AYKSL50RARDZNZWQrIYopomiKB9hD8aUZAiEA0jp/8ll53QA9DgsEvWuKtXlVyBXXvx6P96maBbBW1+I=","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":107439,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.13\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJgwBVRCRA9TVsSAnZWagAADCgP/3z6pG+RGdC6Sl555gOo\ngO8FkwFckCtNEpwJh2Vz3NgF2kp8S8pIrIrMtiBJMDd3hVQqvRIdFIniNkNP\nwElpwzWZVFtqzc/w2PS8JCR/8gTrGd9n61MTFlOtoaThOxnQoNQSt0EAtm1p\nQgqvhMrslK8avcS+UdV1WWZrTOvGn8gDTPUrqIfiQ83Mcz3jjgi0S4zffiQl\n/ajW3ZfqKdUoJsiYj4TD/waej5v5CHuZ5Ko7B2SwaBrzRvgz6X0R3IWimBPj\nVwquLgg13tW9QfMn25/QPLiiYWCqKDIA4vvRIHPYT/8DcfQ8UBH1ZwW7Dhto\ndedkuBU/jbgcYdTkLlhOSe8QD8eLGPLu9nKY4E3lmPX5/8sbBnSJJIHJt0ww\nXrMXplrTZa3LSJwfO3ccvsHlhMrqlURb3ZAuNpBQNm9/G3xs7Zstv5qwf6W/\nJ+h9cGszFdDVYz8E1gS9kTGxMlPzZwdV47xqaR7h8amcVqnTqznQ1A3RlFcf\n/oxQbIyZegfEgIBbn1U+Kwnr3ZKoNomj6oCGsRzsXKu6o8FPL2dUXV1BkMNP\nEYCSMhNL/UxziWl4oDWCyBeJ2ZAINcFTYzAJusSv9XdlLIO435cS1d55zCe8\nwWnC/sxGrz/A2yITfIl7PlxsI3koB6GYdOi9MdgjuYwKSdrSC8yMVnk67PyN\nmWh5\r\n=aMbS\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"media/icon.png","main":"./dist/mergeConflictMain","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","browser":"./dist/browser/mergeConflictMain","engines":{"vscode":"^1.5.0"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","repository":{"url":"https://github.com/microsoft/vscode.git","type":"git"},"contributes":{"menus":{"editor/title":[{"when":"mergeConflictsCount && mergeConflictsCount != 0","group":"navigation@1","command":"merge-conflict.previous"},{"when":"mergeConflictsCount && mergeConflictsCount != 0","group":"navigation@2","command":"merge-conflict.next"}],"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"icon":"$(arrow-down)","title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"icon":"$(arrow-up)","title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","capabilities":{"virtualWorkspaces":false,"untrustedWorkspaces":{"supported":true}},"_hasShrinkwrap":false,"readmeFilename":"README.md","activationEvents":["onStartupFinished"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.6987abd16ed_1623201105387_0.8288286723131792","host":"s3://npm-registry-packages"}},"0.3.0-next.12e7a6a2a39":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.12e7a6a2a39","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.12e7a6a2a39","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"9e0ed3cd80e58a9e72e38314f784f2abc57e1349","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.12e7a6a2a39.tgz","fileCount":11,"integrity":"sha512-SeCQ6W0KiBcs1BzUN8WOuUNUC4YiHZy23FDGOuJaA1CQ2TcN3oVSyuMcFELZJZli1wvSdKVwVnPzDvphkThzSQ==","signatures":[{"sig":"MEUCIQC8p/J6sY0DbHm0SBa/4s4O8jGvdjELwu2mi8ZA3D6REgIgKu0fT8u+DR5x0PxQOWNGLKradBQvqOnxwAGMPgJ4Wl8=","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":107439,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.13\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJgwWcECRA9TVsSAnZWagAAZm4P/2C3jbQ1I6jim5xAqQED\nKT9t6z2UNwEpNkgtNcebrfz3JnOHSuYQLrb9kdXPc2ZkYtwfNwylaUYr7YXv\n/gHkOmasn/ADldA3GwijsxCx7YVnQrHaoZxrfPQt0x+b0/Xhpvcj4R7nNlmY\nrbV+WqpDiyFwN1OWdUMwceky+z40KjaqL2HxQ+xoNXhAcX6WxRuPRfZe2O9T\ndId9gI2WYAMv85JPSJrw+PJm6OxnbE0jxpbyUDSeZKe43siLdchOrRc9g+jp\n2FK6weIoOkD1lXiqGD2e6reoC4N/hso6jcXaNL56bW9D6nWzwsGPb9J2V5Zc\nLnH/eYXNnTgHwKwHSGlPpyd1CBN4ptZMYSJRQYLF2ncWqXS/9yJgjK+Mj0a4\nj1s3nFkDo1dwXSwdfIJDQtrfPRjZNkhKzHjLu9O1XPtWdHLRF79aM6NT8+ny\nhDQ+Q/UhFLSuln/8sFPK9eeGtdBHqZJ2aZwzDU8j5U7XsFM7D/uK15g/Ie7m\nUY9u9gVwic7K7K56rDBUS/VcaTR4SkYLmUYw+NPjuK+O+xGmFAmIEOuQKmt9\nMffWNSt8s59toORfpyZq/v+Lp16pmoUlTvRY/6Os8vAHhkUHslZ7UsOumWd4\nT0pWBbYUY1yZCZlGavA5CKUCSFLjOprIjxgNnPYfEeECZIaat5ZPiXm9kGSU\nlnBy\r\n=BqXe\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"media/icon.png","main":"./dist/mergeConflictMain","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","browser":"./dist/browser/mergeConflictMain","engines":{"vscode":"^1.5.0"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","repository":{"url":"https://github.com/microsoft/vscode.git","type":"git"},"contributes":{"menus":{"editor/title":[{"when":"mergeConflictsCount && mergeConflictsCount != 0","group":"navigation@1","command":"merge-conflict.previous"},{"when":"mergeConflictsCount && mergeConflictsCount != 0","group":"navigation@2","command":"merge-conflict.next"}],"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"icon":"$(arrow-down)","title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"icon":"$(arrow-up)","title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","capabilities":{"virtualWorkspaces":false,"untrustedWorkspaces":{"supported":true}},"_hasShrinkwrap":false,"readmeFilename":"README.md","activationEvents":["onStartupFinished"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.12e7a6a2a39_1623287555825_0.061818360601601396","host":"s3://npm-registry-packages"}},"0.3.0-next.3b4d9757e24":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.3b4d9757e24","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.3b4d9757e24","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"b822c4666e854e0daf7b3e1238ddcc7a380c85e9","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.3b4d9757e24.tgz","fileCount":11,"integrity":"sha512-5qvTKAfqdTn6hRK17RPpyK3xLHmGm60G74Dt0HnZWzptYI8C0jjKUC0/eFBHXUw5rwCbEHEDmkB22Nq5hpoYvw==","signatures":[{"sig":"MEYCIQCRKS/Q3ulXOzOP4s8Af1k/bKKxKvUIVGorgECxDDmVqQIhAOeJ8IZ0MnWBIvUjfpJp73x1Awk45IdKTY8h8Kxs+yyu","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":107439,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.13\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJgzOaOCRA9TVsSAnZWagAADMgP/j8VawI3tVUfN7j4sIB+\nMVRye8xleiuwQCVUekaOZR0zOpMLt48eKUpcvArNDY0mz6J5dTKZq5uda+D2\n8NrwuLga12hJJooEFgNmNb4qYtv2ubRCoOlYzM4gffCufmstGuuVIW26Dysr\nt2OiuxHGQOW5mbK/tuyxQenQlkEMBj3GnF/UxuXSBtsNH2xPHHt8we0CdDix\nLEEsHjTOcLL9ncnJuckNkS8aPlanjUQe9AN50wCQ9z7qeqq2pbvRHiDHIIoM\n2SvI2kXRFYBYoqX8fdBuzpgGI25HIRhXHstbC8G/UY/lENKsg4c3oJso6vAZ\nOo1T4T01jDba+AcLxrAoZ2cWwFDZNT2pjQqfuawqfci7rcktBNUS81D66Cgx\nQygoecGeipJc495aUzWWHqMsqEUzQw6RESix+ltfoxoDtqzvnGPNj8opYD0t\nQreCX8tkTNYlEaDwe2tNgky2L/DTIg7n3srChItx8M0epvlgYBIFQgVT/HVr\ncJ7wcMaCcx13AL88TaJ59pGOOEsnHugYEHJAZUXVdcg8vcQueLD2A8WjhnO5\nlScr3LQTDBbW+FbjW2OjsGe+2Lj4iyN2q+5KVDupjZ7w+/BVXeWUKXF8SWRb\nFK8yOVXym9QKdLkEh9Fg8a8wRDnHQwMzI4QPPHHtzhaR/mJVU8HMMGRH1LlE\nQeGn\r\n=oUEU\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"media/icon.png","main":"./dist/mergeConflictMain","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","browser":"./dist/browser/mergeConflictMain","engines":{"vscode":"^1.5.0"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","repository":{"url":"https://github.com/microsoft/vscode.git","type":"git"},"contributes":{"menus":{"editor/title":[{"when":"mergeConflictsCount && mergeConflictsCount != 0","group":"navigation@1","command":"merge-conflict.previous"},{"when":"mergeConflictsCount && mergeConflictsCount != 0","group":"navigation@2","command":"merge-conflict.next"}],"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"icon":"$(arrow-down)","title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"icon":"$(arrow-up)","title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","capabilities":{"virtualWorkspaces":false,"untrustedWorkspaces":{"supported":true}},"_hasShrinkwrap":false,"readmeFilename":"README.md","activationEvents":["onStartupFinished"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.3b4d9757e24_1624041101723_0.8769501361906309","host":"s3://npm-registry-packages"}},"0.3.0-next.c200dc4909a":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.c200dc4909a","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.c200dc4909a","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"47329c7313647fbbffbddff8f9d9af2388135c98","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.c200dc4909a.tgz","fileCount":11,"integrity":"sha512-MUFw+cPaLkw5uNO6oodAriEH/FpnfD1hZcNEbIzuPxkCTBWzrBBZrhcOVUueqclJlUyK1l68LV13jrIxmj3jAA==","signatures":[{"sig":"MEUCIBT34qqPy+9vvclCB+QkVdsjgjQHEa3btOVKsSLb6KgcAiEAl92+24u35l5ZLQa5V8t+64PyHX3j4p7+K848AebY4r0=","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":107439,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.13\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJgzUMECRA9TVsSAnZWagAA5NMQAIYULy/yxztFw0wzzn3Q\nuDU4FUom/G3fc++CHeyzZURHLoppBf0oCV7P3jPt6emkp4DiSt59RhlENgz5\nQyqSs0WyJgpYfodgpJsESlRi2tfytMC/WHXOxueKsCb+rA3k8o8R6ywSvW0k\nb41X24wSZvXIbFXYJ0jMTjynn+iPh1KiyBrLBWSjRQ8PafCl/z6Kpg8mJhlw\nRVfIybIoIpwnnFhsma0iXpS5HQLC5Iiw0YLX8OTX3cEWoOt09MPEYf8Mpsts\nxI6HH/Qn8rBLKX9qd3CdRmWErbP01gcH8SoK7GXuqI4+tp1VqJBTPPoXKt+i\nEmysoK2KC8+wMhvr9rEz2TYV6jn3+WjysnpCC/etr11vS2LvuOUQA7Rd671G\nt4LU/p8s15XzFATNImHmNiTIrBWRk6SA1vp0GKRSj7ntNn7HCvIhhKs5CiMG\nqHTNsa9LUlAq+fx4JkUg4vmrrqt8C7ArTTm6XrOFDpVhVnDxvbGU7vM0yIsj\nWpMV1amEzNHmhWoQmt8MRKwgx1e+jPN2Vd6PABYUkeIYgW11wicAI/mc8sRO\nMjQ+rihFcYnJnOZzW6CuxY50+IraFGdI3q4Cc9oGUN6/dqCW9nTLjufundhy\nzJGa5El+kePgI8k0ODiCB00vwe8a3brKERAeXIV+WTPh920H3LhCQIgitbQx\n0KDk\r\n=WbU6\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"media/icon.png","main":"./dist/mergeConflictMain","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","browser":"./dist/browser/mergeConflictMain","engines":{"vscode":"^1.5.0"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","repository":{"url":"https://github.com/microsoft/vscode.git","type":"git"},"contributes":{"menus":{"editor/title":[{"when":"mergeConflictsCount && mergeConflictsCount != 0","group":"navigation@1","command":"merge-conflict.previous"},{"when":"mergeConflictsCount && mergeConflictsCount != 0","group":"navigation@2","command":"merge-conflict.next"}],"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"icon":"$(arrow-down)","title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"icon":"$(arrow-up)","title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","capabilities":{"virtualWorkspaces":false,"untrustedWorkspaces":{"supported":true}},"_hasShrinkwrap":false,"readmeFilename":"README.md","activationEvents":["onStartupFinished"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.c200dc4909a_1624064771709_0.38253336674010785","host":"s3://npm-registry-packages"}},"0.3.0-next.9262b186b97":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.9262b186b97","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.9262b186b97","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"9b51e806f7efdb8cbaf52de69e1d4d8c3650db06","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.9262b186b97.tgz","fileCount":11,"integrity":"sha512-YktzqLXuUqKFZ7U3+ztK5tmsVlhckV1HYmRoK87VOU+REZmFe+uJ6sFnnHFn4WkDaNFILZ0zeE5G9aa1fqIMuA==","signatures":[{"sig":"MEUCIQCIeATDmXgAkGzzqpUrD2zfXnwEDq7puwfF3HC1XaOonAIgAoAdG197Is5V3CDYVk3Kwo66ScF59n6735Re2R1vf98=","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":107439,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.13\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJgzpTuCRA9TVsSAnZWagAAqGkP/3bJlpxA7gkYU0yGdp3n\nI2vN5ry9ww8Pb0uiF2khmYQCz+O3JtQFhOnEp1pBK9heAdEh8cBi8QMzWarH\np4qVGjCohrO46BmqktHyTt7ah936G7V6W0HqBihpWnUKWnH4MEI6eNpG5cUS\n9bxqA+3DIuVHDbcax5MEviU3as9mr8h+nlX6DBd3MctUzyjp+yhmKLVo85cr\na/sx/+2S7VscoDh+apm9j/BXrV5jIIjY+XrCs+v/A9UBBaPC8HuHUdThQOSa\naMiIY84r7tgJouZEmPmiJY1BCp7yphzAyT6LunAf0oehyqLxZpIcEs2YDOuT\n8ZOuHRFMw8BxIbDDIr0fcsP54s26djlw3ZNCYgSTvzrc7drJoJGBZfEGW5x+\nj3XGnfua7j15oRhsCgtZSpPLRtqjH1U19vYnMYpvpdkQSRsR2Yn31IdvdS3F\n9BPneyTpZ/kONzXo5a+gDWCWC9BrlZkSeRab6kGHhjSseQdVLYcYhTPAeb4Y\n9kyb8+BjllcPEMcYvxTyzs0e99xaLsUjAXuz0+OHU4B2F09bBKlDQkK2KfWh\n7DPlfrXd0kH+D43avIuuTuEMZyUQa4T05gGIB/7PyGe+PK0BF/mQeITEmzYZ\n19recLZwCy9q7V4AzSHoL/2dzmsS5YvVghga3kzIxweURkpr1WT8u1eaHJyi\nFqi8\r\n=DYeA\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"media/icon.png","main":"./dist/mergeConflictMain","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","browser":"./dist/browser/mergeConflictMain","engines":{"vscode":"^1.5.0"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","repository":{"url":"https://github.com/microsoft/vscode.git","type":"git"},"contributes":{"menus":{"editor/title":[{"when":"mergeConflictsCount && mergeConflictsCount != 0","group":"navigation@1","command":"merge-conflict.previous"},{"when":"mergeConflictsCount && mergeConflictsCount != 0","group":"navigation@2","command":"merge-conflict.next"}],"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"icon":"$(arrow-down)","title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"icon":"$(arrow-up)","title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","capabilities":{"virtualWorkspaces":false,"untrustedWorkspaces":{"supported":true}},"_hasShrinkwrap":false,"readmeFilename":"README.md","activationEvents":["onStartupFinished"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.9262b186b97_1624151278487_0.7658246217813363","host":"s3://npm-registry-packages"}},"0.3.0-next.6afedfdad59":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.6afedfdad59","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.6afedfdad59","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"25d3d3f486d5a8ea3bea7195bc7bc407ffb80a4e","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.6afedfdad59.tgz","fileCount":11,"integrity":"sha512-1qnzpr/4ve3EewJFPmDc7DKglK4TEO+d30kK2dYUNfcSceVgipR8GuQGaxxuMZPr5USlBwUMZkTBnCe7gqLYlA==","signatures":[{"sig":"MEUCIHnzQxbqcrZ0yMkqsbfjTwuF4JxqnKVAyRZep1/UbIHdAiEAu4rX/uykVE8C0Vx/EG7IQNc+vOGvDtwyH4fqkL3iys0=","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":107439,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.13\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJgz+bZCRA9TVsSAnZWagAAD5IP/2nOGp7lQowYu9HBl7jD\nNaaiWDLDuKTdJrRCUl+Rw26hIXSYJ7+8I38xmFL7LSWLi9dnfU+Uuk9MDdOy\nfRLmiC6WsggVNYFa3FT5bVK0alDk/9nFdgFbMM07FVtsmUmwx11sfVYdn1BA\nHGaHWrq3Gw7fBjiH3VQgu54bNaGkUbdkL2kbo3lQPamCtlpmJpxgoEum7ebY\nNbo7trhDc1Y1LGm42WzARb2AoHxVEJwrCgSUPXpdgu44vaps+iQ1GSsOFKcF\nygFezLGe/aMkz/cfk1cy8fcnnurta5I14IXDnDV9zfc3+8nhS6JdeHAQ2T9V\nc0C+RBAh7vANJMM6/lIC31NW5ug0Gjd79PNA3lsDS9X9Hhw799E+PTI4/ZZV\np1yEq6iXut4mQkvYV6xZ6R/I146FN8Jd/stfTS3prCpnbTe8Tw6/00r1INmf\nH2SILtfRv/45HQNKWe0Ov8Zsj1Mi+hrOVeVD0owjMLqqB3ObKe7mwVCezEsT\nIRqnV+fL5r4bBqg09eeQGIDDQbA/K08WcUpMDLG7mVG5FQIbfQuhWSTdrVzZ\nWxmz2ViIgiXB20tmcSjWI8XxgBkXfRIPrNhlDJ+Qosu7ZgHwIclhOijQQ5Jd\nOygLyiBercbvdMtRLEQryZuvRcd1hSdl+lr/CHoxO35pRyk1Um6KTBVCibbH\noLu6\r\n=jbRK\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"media/icon.png","main":"./dist/mergeConflictMain","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","browser":"./dist/browser/mergeConflictMain","engines":{"vscode":"^1.5.0"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","repository":{"url":"https://github.com/microsoft/vscode.git","type":"git"},"contributes":{"menus":{"editor/title":[{"when":"mergeConflictsCount && mergeConflictsCount != 0","group":"navigation@1","command":"merge-conflict.previous"},{"when":"mergeConflictsCount && mergeConflictsCount != 0","group":"navigation@2","command":"merge-conflict.next"}],"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"icon":"$(arrow-down)","title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"icon":"$(arrow-up)","title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","capabilities":{"virtualWorkspaces":false,"untrustedWorkspaces":{"supported":true}},"_hasShrinkwrap":false,"readmeFilename":"README.md","activationEvents":["onStartupFinished"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.6afedfdad59_1624237785499_0.5881057068559612","host":"s3://npm-registry-packages"}},"0.3.0-next.6446b3a8e5b":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.6446b3a8e5b","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.6446b3a8e5b","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"1ebe51780303f007bbc47f0309101c0ab7c8d185","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.6446b3a8e5b.tgz","fileCount":11,"integrity":"sha512-Fd0o84V5Lkn5j22JcECbJMiA5vNzJHDwkvFculpwMMVMPu7rJuOEQ13NersqPkwLAnZfpfqWlJhhtIsIRTXhKQ==","signatures":[{"sig":"MEUCIDceowiz6sUWqkFLMA/kep7CoihKordrX2/op7bR84+xAiEA6OsxebzuBuS6BMLp579ZP85hWXgKDiT2FnCSzXee750=","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":107439,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.13\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJg0OquCRA9TVsSAnZWagAA924QAIYtDYauabxh88iXjAmb\nh5M9Wta03IGkdeaHJtOQs1UyMFykKPptZXC+N8Pb3E0W+kQ4Oeo0NgLJKjHg\nHk1bhR0LwqO0sgUg8XwBG/as2MQjiWWksNjjy16AYPeXoZ4PNXZjKQRNGS3T\nv39kjqHeo/IQmGEEh9Tm6IcjIbrFUKkNY6O9rlCMT2ysUenjr2rOpHFAphXt\nh/xdLwm18gZAUdNuDXhmwxEq/s0oqnyKRlhtdSuYwGJfugtAfbaDis2gSM80\ndCq3uxjS4DUvYtCRTOgSOxH7PuhrBz/Fn5/k/HX7DOtyeUYQidC2ie2Bxh4t\nMd1PKPn5r2hZKiVWJOMMa87chlWeKA0FshWt2O1rbs2VeHa5UI8UBsgLm5zo\nRaJVM5VEB5qDBLAd0VhS6XPnEJBE+svwHEz8d+SaXeDRPrjawCTi0w0ImFBu\nug0+2l04Bg96e0IAc2myhoKh0Wzql+8b9Pncc/kQz+YI88z/ezTEKbSJstHm\n6NZiIXWHeECkuhZOgy7OGKpQxRCZvWcSzRTIonF9A+EA7aKZX/axHFrLi66s\nxlUpw8EhQM4ZFY4EsJ8KwXPOm0PZ3HEzfM32Ziw32ifeS6m+tKPUsBcr9eUB\n9ppLpLD/SvlLitmWG2DAgEgo6BXezB96llmyaQxBlRevRJUGRpA6H11vh7ba\n9nhg\r\n=wt5a\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"media/icon.png","main":"./dist/mergeConflictMain","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","browser":"./dist/browser/mergeConflictMain","engines":{"vscode":"^1.5.0"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","repository":{"url":"https://github.com/microsoft/vscode.git","type":"git"},"contributes":{"menus":{"editor/title":[{"when":"mergeConflictsCount && mergeConflictsCount != 0","group":"navigation@1","command":"merge-conflict.previous"},{"when":"mergeConflictsCount && mergeConflictsCount != 0","group":"navigation@2","command":"merge-conflict.next"}],"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"icon":"$(arrow-down)","title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"icon":"$(arrow-up)","title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","capabilities":{"virtualWorkspaces":false,"untrustedWorkspaces":{"supported":true}},"_hasShrinkwrap":false,"readmeFilename":"README.md","activationEvents":["onStartupFinished"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.6446b3a8e5b_1624304301690_0.774170709059083","host":"s3://npm-registry-packages"}},"0.3.0-next.d301ca55b65":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.d301ca55b65","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.d301ca55b65","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"8d2daaef110aeaab5fecf0a3fa7dd24dd12ae376","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.d301ca55b65.tgz","fileCount":11,"integrity":"sha512-fsD/vjtrM4MI3XYIS6B1U9/L4TKBsOFTOa2if9KVjrDgwGUSAACH+wG/bZLxutVG9N8KjwAqab3JT64jEu16wg==","signatures":[{"sig":"MEYCIQDbh/ObiC7IiHKFwNs8KQzbgoJ8qayRWOJ8gAOtT8ZzAAIhAMhz+NU/CumIOhgdG15GThk3edWhAmWjOsPNMH7PKPQv","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":107439,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.13\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJg0TacCRA9TVsSAnZWagAAmyUP/0dBzHQ27gsBMY1kGXsa\n4lst6OG2wLroVGiDewZBdKM9/FJjubVPUMr6rN6yenG0eC+kbsuPhObLjTn0\nuSewlWznZrjiTvz3ZqjrXPeAmG55+oB3Yb0qkngAg8EwCvmzzjAYTCv+8xJT\nq8d16bXhiPsLYMmReX5jZ39hQoPrXpX0jKWdigJ/94YWgWBc3+oQU9BBxgz2\nvZwn0sZjw/O8bUN2VJ+mlCjGo4Te8epZwVvCb2ZqLCp7fOJp1WvoicF4D4cA\nnrRrDBJbFzEQ7B9iCvoCClPtlmynxc+GsU5jSqaMf478j/+1dtWQdD7JLc5X\njBvmILfrcSkUhRPC89JG16Z0Y8Dy5GteHb/YxbqZEw75wIvqbZCZMqt8+UoH\nHDZqj1YebNZl/D76Tx+tUm7GfBui97vjfPdfdCdcOyd3rhtfRHWG05gzppzA\nxaGzc2kHrq1tnDP7fhbjkXlJiUMvsthIxT4NRpKeaIbPmd/RA1c2TSHUoi8Z\nQJw1iDhxaLbaQKUku1/nQq8HERXyte1fugEAjmkISKfRJroXhaIPA4Bk5BFt\ncZEFo/seGhFNAt7ZHaljpX5Y5Kb1464/TE9+DAg/dO1yu0KDMV8r38RGpSKy\nfxMDd9GDuHWjPLDif/P/kqcWoURlMvoaUuRLZH3UKpDo8Vu0ExC+UnFXQtql\nYOpx\r\n=QfEb\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"media/icon.png","main":"./dist/mergeConflictMain","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","browser":"./dist/browser/mergeConflictMain","engines":{"vscode":"^1.5.0"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","repository":{"url":"https://github.com/microsoft/vscode.git","type":"git"},"contributes":{"menus":{"editor/title":[{"when":"mergeConflictsCount && mergeConflictsCount != 0","group":"navigation@1","command":"merge-conflict.previous"},{"when":"mergeConflictsCount && mergeConflictsCount != 0","group":"navigation@2","command":"merge-conflict.next"}],"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"icon":"$(arrow-down)","title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"icon":"$(arrow-up)","title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","capabilities":{"virtualWorkspaces":false,"untrustedWorkspaces":{"supported":true}},"_hasShrinkwrap":false,"readmeFilename":"README.md","activationEvents":["onStartupFinished"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.d301ca55b65_1624323739754_0.8048541574559089","host":"s3://npm-registry-packages"}},"0.3.0-next.96e6d1c933c":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.96e6d1c933c","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.96e6d1c933c","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"088d9e7e818c06cc8dbec6f8d31e4bbb6623dfe5","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.96e6d1c933c.tgz","fileCount":11,"integrity":"sha512-uHpsC/5TFcDuLpJ2UiqcJQ21eTLsGv1XOVWxyU2q1z2O7J7tWgVGPrbUJrBOXh0doZx0XJ6jLRpgp2LpJNnsDQ==","signatures":[{"sig":"MEUCIQCzD1OFYMY6rde17bqUdddcjkZw0eiMkTohBEegUwBgcAIgUJCm1GtOwBPCrSRhn3aCHyyKB7vhrCu144tPMt9Lg50=","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":107439,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.13\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJg0dkFCRA9TVsSAnZWagAAlNkP/AjjjHirYu/f6Rl9vZtD\n6FEObgzHS/Nstr1jrHCfHPrrJSXjQBVvVHwFCI6KG8c7PCHUVl+CyNIJkcYa\nnIgBqrbmCWM5dkFVzKXCd2fHY4gMNdwaxceoVXE9SmTG+QkhKP5i1cyPI7Gs\nwksL/lWZrLQQFcD0qDoq1dfQSWVeg36ubi4swm7xH5YVWQlfAEXcwywjrOcd\nyO0/l8srhnXPNLlFx/N17cnE+6BJVGgZSFO5PEGrfmFVT/qrtDcX7qYPxI7S\ne4Xn94ptWkrg62FSB1abdygYMJmDensitNn7VadR/UuAjGv3cLZMTRY4hIlO\nIbSNF+GOSARuTp8NgoiYTuq/4W4RC93/hhxEVFiLT/NFZN37rrE9GVWicFeN\nZkZYGhxSeo3dSwnnd8uAICRWuA2WTeDVI+mBY6jEezGbKov76Ii7TFrxAKBt\nNfYZQtTkron02rmEYbjAM5LqPqW+pBjmhPOjSC6zToPllq4N5fOPqELxTVe2\nY7x61uKMpxFMZCXa7lu6o32EjHZyfs8deHQNKgzh8TPGM5GvDVYB0qHh/HIO\nTDN6CkdGTEBy3H2Z4xXvgVuxRv/AVSYXC70s/oRnSEq4M00/szQEvDyHboWP\nOxlJeyJ3c/9pvhjoMvqJOSPAW+WyXO4Ajrae2xqtVXvITEYr9Kch+9wN7G6r\nIqz1\r\n=pmQF\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"media/icon.png","main":"./dist/mergeConflictMain","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","browser":"./dist/browser/mergeConflictMain","engines":{"vscode":"^1.5.0"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","repository":{"url":"https://github.com/microsoft/vscode.git","type":"git"},"contributes":{"menus":{"editor/title":[{"when":"mergeConflictsCount && mergeConflictsCount != 0","group":"navigation@1","command":"merge-conflict.previous"},{"when":"mergeConflictsCount && mergeConflictsCount != 0","group":"navigation@2","command":"merge-conflict.next"}],"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"icon":"$(arrow-down)","title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"icon":"$(arrow-up)","title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","capabilities":{"virtualWorkspaces":false,"untrustedWorkspaces":{"supported":true}},"_hasShrinkwrap":false,"readmeFilename":"README.md","activationEvents":["onStartupFinished"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.96e6d1c933c_1624365317323_0.9974845719207059","host":"s3://npm-registry-packages"}},"0.3.0-next.ad59351c0fa":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.ad59351c0fa","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.ad59351c0fa","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"d450437b0e28436d253ce54e48f81eaa2fc1203a","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.ad59351c0fa.tgz","fileCount":11,"integrity":"sha512-p892IPt3n9PJ60go5VzX3JkLPwF2BagoyN/73Y1LmHJ4Q5zJH1cDABz9Lu5FrRZ2YYMkbxAmBq4UWcdEt0sP5A==","signatures":[{"sig":"MEYCIQCrlCMVoWRykMMJRrPNKkejruFWePFZFk14E5WWBmpWUAIhANVr4tfSOGqxS2RHyYeDeJUHgobliHwhOqG2n1wn0kwN","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":107439,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.13\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJg0eiMCRA9TVsSAnZWagAAEgoP/2q5WQP8nu4vYxp1d9Gp\nwMWTHU+zr3Opyq8j0bCulbk+eF6LhfTYtsuzaCNToZk5wqjNsh2Vxby0BFDS\nCJxKZupmV8W2ZuiEoPRT6q6QpFCWgIK2aAgRV4C4XC8F92svzWKsF5j//+vH\ngDXP1QZ1IZ1h2MMdadSeb5AmyyMiOEUdhXgp/Bu4OMepwAKpR95PDw0n5hgj\nKlKSBuVuNsRwYEF0yINUzxkPVuTeh11GuzzFuuQuk0OGcWRG2rzmoxfvID4z\nRXUqC/Gn9H/jZ6iFloVQ+xMNPkHgoCQMV1Rzvv6tN78zHg/70lxyKy3Kancr\nX0vy01v2Kn0Owdn5FYenp2+jDMYSV1xc26H27F7qqT1jab/UmzYo65u7Uc+U\nd3Aw94/g6RGQx1/DeqCPZJ6K0h1+14N3g3GfBwZyjmxYE7mudqSUNUkofuDv\nSVC/8RWWB+L0DRwQfp1aURPPuPAWxxkvN81DBl6qjjw2Vra8gFs/Sr+GTaLI\nxRWDbNp+2b6uY1JFmUqQRn/zEhcTZ9nmqNtoRGs4c2kRoAmbaw4EWGWYSlgs\nPtbVQQRa3bdISZFeZSyixEOLny0AnoKfATLjefNQARZ+wHQ8+kpkY2w52P0Y\nfOFozML2KCqGkM0QiyrGwHmOqKkPQ5GxZhfB8lITN7n3sfvPUhuVU76LhTTS\nBPG8\r\n=OfVD\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"media/icon.png","main":"./dist/mergeConflictMain","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","browser":"./dist/browser/mergeConflictMain","engines":{"vscode":"^1.5.0"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","repository":{"url":"https://github.com/microsoft/vscode.git","type":"git"},"contributes":{"menus":{"editor/title":[{"when":"mergeConflictsCount && mergeConflictsCount != 0","group":"navigation@1","command":"merge-conflict.previous"},{"when":"mergeConflictsCount && mergeConflictsCount != 0","group":"navigation@2","command":"merge-conflict.next"}],"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"icon":"$(arrow-down)","title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"icon":"$(arrow-up)","title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","capabilities":{"virtualWorkspaces":false,"untrustedWorkspaces":{"supported":true}},"_hasShrinkwrap":false,"readmeFilename":"README.md","activationEvents":["onStartupFinished"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.ad59351c0fa_1624369292288_0.13206293864853125","host":"s3://npm-registry-packages"}},"0.3.0-next.92999c339e2":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.92999c339e2","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.92999c339e2","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"a1485e83b26bbc8f9b4d47b4b717dbbb72a50875","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.92999c339e2.tgz","fileCount":11,"integrity":"sha512-RakbJgPmkZ9LyzFRK66zIi73S75YyRzY6pijA0EXkpF9ixuhvRGyZJGd60M36RqtzA6jHip2snp9QD246xDDog==","signatures":[{"sig":"MEYCIQDlewbWtP9Dvc5aT0on4vc1h2GbuIAkl1iIp0wj0YRuLAIhAMp7LYFXgIHbBTWkWPa2AF0NDxW0tnPUd2Rk89N2TS8A","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":107439,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.13\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJg0gwjCRA9TVsSAnZWagAA6CkP/RElodr/3wv6taudaonQ\nBJQLRHQ/Et1tm4IXnER3OpopktPgUtHno3tlCpaCMUVZ+sHNui1zIpUyCUQU\n3AJhWuytN3TBLU9lImzt+qb/udSu3HyAEhibBlSlRwX9JOo943DGRCAnuGaj\ncILCJ54ffcWfMORgk+QD7lM9kkY5jv5ytlSHFg7Hw8qmDPqBuqubB7gjAfnh\nCadLzaUanu3OEmkbZbFNz9kZoToSR4AV7WoPrqa2Wn9OcRo5vMVGtLDKRv3m\nhnsWt0ydzcR7oWii5pwcY7WJGvGU5HHBnGBEQDPexpGKJ+kgLwMp7T9M9jQ6\ncu+XaIju7XDxv1h5HxiOaP3gdJsQV1hDqUHuBhnVBrs7IrdzEQOZ0+8Iy0Pw\n4UB57n9nxGcx5s6Lwal8ap5A7Kd92R1454TF1l0S6Ro/s4twEc+mbb62yNQ1\nZ69SB2MGF21sDdUjGyLwH+dLZZ51nBe7zwrF+x/KrMJ03IrdiSMNas11l18C\nByrwrMvP7Ba79tc3xu/yj2o7WZuurd9CRGMSGR5B15t3PtaFBYGZFx6s+4xb\nf75z4JvrF+x/UQ2FlP94UfkhazffrReRLZDEvRM7ZEzCyoEOAKFlawdZIM/e\neAqOwgowfcT0tQHqVOJH4xgMZuuH/32oUw4I3g9rR2uOwdJ7ujEtc6KgjxQg\n7ZCs\r\n=iroC\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"media/icon.png","main":"./dist/mergeConflictMain","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","browser":"./dist/browser/mergeConflictMain","engines":{"vscode":"^1.5.0"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","repository":{"url":"https://github.com/microsoft/vscode.git","type":"git"},"contributes":{"menus":{"editor/title":[{"when":"mergeConflictsCount && mergeConflictsCount != 0","group":"navigation@1","command":"merge-conflict.previous"},{"when":"mergeConflictsCount && mergeConflictsCount != 0","group":"navigation@2","command":"merge-conflict.next"}],"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"icon":"$(arrow-down)","title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"icon":"$(arrow-up)","title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","capabilities":{"virtualWorkspaces":false,"untrustedWorkspaces":{"supported":true}},"_hasShrinkwrap":false,"readmeFilename":"README.md","activationEvents":["onStartupFinished"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.92999c339e2_1624378403179_0.043098789790281034","host":"s3://npm-registry-packages"}},"0.3.0-next.be2ddfaad6d":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.be2ddfaad6d","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.be2ddfaad6d","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"bc13fdde53493e85ce3432276ad9f4ff80e089ab","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.be2ddfaad6d.tgz","fileCount":11,"integrity":"sha512-WPdtRTQi7ciHxg4T4KqR98ycZqeyNDsU8oflGrT4brtUyOY1IgssmspFW26rg14F9+KAjPAYWpKkDGmWcAnuQQ==","signatures":[{"sig":"MEUCIDlhFZVJq1zHg8inVfMeOZtn/ss78Cwj090c0LyRrnzGAiEA6CMD0GUmhWc5il6EiTGvLwZphiBLEw3f5GJWXoulLrg=","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":107439,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.13\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJg0hUeCRA9TVsSAnZWagAA8r4QAKKH4ULWWaFaJcZz40pF\npzE8Y+gfRk9Ymz/VkinTEBELAeilJLlneHPWNMph7g6GIqnAgDwMTx90uTlN\n8tQ4ZuqA3yIqJKmcLc1m01aM+gkqWO4IHZdyPkx7vGhWoaF86yDW0GNoHeLa\n8NqfwsZ4Hf5Ez9fdnA8KK8210EUiGPnkQnFjAJ57C63vlBDSTn9teqCoNt+x\nWOCUEuWIjs94hU3LUN3N5LcEcK11pcaF27yiwjgzPlrQ6FfRidjo0X7zX4W/\npHRR5Zx7GfVug0r2BoxKsUNK/9pQ5oVMW355nHCpxjFNYLxVbFo6QFxwPtlI\nY4/TExgjMFKVT60RY6Ecyb7sSPuzQdLKE3oWh0Ms9k9+Euv1tPS0EF1R5z9b\nLKzLAALPiVCHaif50BquAwME0N7V0QhrxrmVhwNCS7kMTOWqzWjlpXeylLRm\n6ByezGvSA8CG2tn/4qxrV30d5WAJ7ItjdvKokuxgSNIROw0aqWkKeFvB4SCh\ntZWeC0FhFYXkRD8ULu1h91Ple552XfWK36fhFehlkn1ZM7GApbaR9F1IKyL2\nqpKX0ui7p0ZZGi4q3r1pxXAXU6Aq6zrJi3qFcbOrAmEA4dRjrkZgYywB/btx\n35LZNBKYzpKCH3wB0e0Y8iOYN9CFMkmWqU292Gwj6p6pwcdEGFXKkuJRhM9h\nTFVd\r\n=pbKR\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"media/icon.png","main":"./dist/mergeConflictMain","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","browser":"./dist/browser/mergeConflictMain","engines":{"vscode":"^1.5.0"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","repository":{"url":"https://github.com/microsoft/vscode.git","type":"git"},"contributes":{"menus":{"editor/title":[{"when":"mergeConflictsCount && mergeConflictsCount != 0","group":"navigation@1","command":"merge-conflict.previous"},{"when":"mergeConflictsCount && mergeConflictsCount != 0","group":"navigation@2","command":"merge-conflict.next"}],"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"icon":"$(arrow-down)","title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"icon":"$(arrow-up)","title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","capabilities":{"virtualWorkspaces":false,"untrustedWorkspaces":{"supported":true}},"_hasShrinkwrap":false,"readmeFilename":"README.md","activationEvents":["onStartupFinished"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.be2ddfaad6d_1624380701755_0.9722014592546491","host":"s3://npm-registry-packages"}},"0.3.0-next.7c78ef3e802":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.7c78ef3e802","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.7c78ef3e802","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"9aac04a05f863585d2f76edd599873295597e3d0","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.7c78ef3e802.tgz","fileCount":11,"integrity":"sha512-pGCqgIRhB6YxJCiWgPRYYbLHzCrF+JZmVYvN0KzRGAMjPoZcxeiNVGjE5FOdOSGdXAcwx31nJlkzO7JCMD+lrw==","signatures":[{"sig":"MEQCIE1MmafRJPun5k7J26N8iFQJn9vA4MEH0c/uGlAyfLgQAiA2sy1dlXsVYhWmfBI199gesbiM1U7kurjoIG/hRcG3Gw==","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":107439,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.13\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJg0h4BCRA9TVsSAnZWagAAkocP/3zcYnrApvcEJVKr+GNB\nq+2gEGzWugu0uirY40ehKLHu52Psd9SUoaCAI2f588emc/J4JucfMeCExjdG\nw7t5hoSjK9BgYNcwZi1Bo9BlCKpCt8MsPBaf0Frl1GlvTb1VmLFepdyapOd4\n9+eDYjz4XPEFmUOqv+vFhy2jeJpP9PP934KudgCjPs9TVfSQ9t+mmnvP8dHG\nzNdg4VEMXXVv6PWc54494TUyh2WP2D3HNTU5hw/lKSNmKpDJVNRl8CjBLTop\neYP/r9RzCWQmMHNCVMD7nbUtPL2CpmmrGDCrXQbDtKCNT5NPJHlKPDZ+lDex\nLZEMrwfZ0ipPdOomWOYomp0N0jUbsW31KFoPBRMBbEXO13h1sjnNujklsOxD\nVaHT62zjCc+QPj4ezs+FznasPazRBtqfVbbt9EXNGQTHIhx2oLurzgd2/bHu\njwuB5HUGNjeyoi5Znu+jIjPf784NDb7X+4JXfimeR66xynsk0S+K2nu0Cw5H\nX3dCsBMdZdNgPSFQUkAdZlDXfG6PQj0/u2vWu2W5G+jJISTivDbNqoBQARbb\npdDfT1anbHMLFD+KxfiF2wxowiVTYNAQYXyASEdY7kwivyy2hNkZJ8alwdXV\nBcH/aJRjK3mFhrN2trbE51ZScaoa+P2cbErsGIzSN0IF6VYrPu30ggrFNW3d\nLrLK\r\n=Vtoz\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"media/icon.png","main":"./dist/mergeConflictMain","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","browser":"./dist/browser/mergeConflictMain","engines":{"vscode":"^1.5.0"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","repository":{"url":"https://github.com/microsoft/vscode.git","type":"git"},"contributes":{"menus":{"editor/title":[{"when":"mergeConflictsCount && mergeConflictsCount != 0","group":"navigation@1","command":"merge-conflict.previous"},{"when":"mergeConflictsCount && mergeConflictsCount != 0","group":"navigation@2","command":"merge-conflict.next"}],"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"icon":"$(arrow-down)","title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"icon":"$(arrow-up)","title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","capabilities":{"virtualWorkspaces":false,"untrustedWorkspaces":{"supported":true}},"_hasShrinkwrap":false,"readmeFilename":"README.md","activationEvents":["onStartupFinished"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.7c78ef3e802_1624382976942_0.9703448021209296","host":"s3://npm-registry-packages"}},"0.3.0-next.fece68a1f4e":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.fece68a1f4e","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.fece68a1f4e","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"1f58fbbe7728867264024bf17509abb740663126","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.fece68a1f4e.tgz","fileCount":11,"integrity":"sha512-oCSDvkY+nUEWBvMyRqNdXzM6YL4h/howwtql1LrJsojbcOezxSES9pXdiwsnA+UiSGs6W33kPauKsvIuxxYYaw==","signatures":[{"sig":"MEQCICWf9v8YUPnEZYyoyYUYSrUDUbpsgL/1WljH9EcopU1JAiA7qHGkt760nFVD6AyZ/qX9nbbxPJXRZXpgVMH8fttPMg==","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":107439,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.13\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJg0oeiCRA9TVsSAnZWagAA2X4P/Akae7/NFfJMN/xAWwjZ\n4sOXLIe2Y7SpsRZ9Xeyr0IaT6hGG2cEB3ySHi5rbpgAFi2OQrASRmpb9uwE1\nHlqgrAqvqPMVzN9x2izfjzq6mb1Ifn5KSQIb8yUoYqQCFDZLYiKYV7s9E37c\nUZYdY9aRNdmLhPR/HBvTA3BtACn6nsUXCIf+o7YNE5YvzzSMC/dTQvIqNAsQ\nlwmdW6aCpaIm1CcR5q4a0PMzPOZs9J0c1I/3wub5F8aBcXq6KxDiJo5ViSuN\nleA1I6VVCNPCaLSoyfREr7ALnnK7oa/NdzYkUeE/DFLJftWqF8LHs/kfYirh\n3Ot13s4LrcO+Ow7vrS+GHB1s6G68LSzn/ciLFHdsK+qTt8oKKhD+UwY+8ExQ\nWeELFTehhCd5igPvgIpeiXVS9Jx9PxTAoZMtW3IyM0cMaHhg8fhC2sTph4td\nDVpG5uATmRfDbnXvzxXsELdVu4zkKf9iAo3dIsUNI75nJSsEwoEu1R87qsq5\nR4kJHY8JzB8QK1BvEUN26kaGfbqnNyXuSnfLvaOuA6/skNKVeyaq2ttMZgiF\npgnMDhyLzWSfzH3qesOkBd34qoVR99W2yLCHpICYbnywuFKqZpGpWmaoKiX1\nVQ+hu7MZAfemUkDWq7ZyBlFMSq6MoAyb6NIILFp5OEAVw0Z56MIFgbccxp57\nDVl3\r\n=lT2C\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"media/icon.png","main":"./dist/mergeConflictMain","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","browser":"./dist/browser/mergeConflictMain","engines":{"vscode":"^1.5.0"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","repository":{"url":"https://github.com/microsoft/vscode.git","type":"git"},"contributes":{"menus":{"editor/title":[{"when":"mergeConflictsCount && mergeConflictsCount != 0","group":"navigation@1","command":"merge-conflict.previous"},{"when":"mergeConflictsCount && mergeConflictsCount != 0","group":"navigation@2","command":"merge-conflict.next"}],"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"icon":"$(arrow-down)","title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"icon":"$(arrow-up)","title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","capabilities":{"virtualWorkspaces":false,"untrustedWorkspaces":{"supported":true}},"_hasShrinkwrap":false,"readmeFilename":"README.md","activationEvents":["onStartupFinished"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.fece68a1f4e_1624410017677_0.16600971693972388","host":"s3://npm-registry-packages"}},"0.3.0-next.a3fc50b5005":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.a3fc50b5005","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.a3fc50b5005","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"ccecd6bf00dfbff9435cb292f708486eddf65d7c","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.a3fc50b5005.tgz","fileCount":11,"integrity":"sha512-/vnOhSEnCdozYoTTdnDk9oIrjIn7XI8svwO4gdXLXEMy344AOpCSVyGPuPadEcC0yrVMYuAChYqkh7dNoA414w==","signatures":[{"sig":"MEQCIBBiKc2PAjqocg1c3LPhUI9ILZ5BKPGM+vN3GnR1X/QDAiA0ZVynBtWmlwHpGAVxrzd5s8+Qg7uavtT5173J02SQ+Q==","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":107439,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.13\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJg09dyCRA9TVsSAnZWagAA00QP/AjukorpfUmSJSa/5k/r\n11UbXeSficxl3b8jRSHfJAyj9HH/QpHqFUqaFLPLjWhHDSuspGcXmr5dIpy0\nqhj5DSB4yIpyEUWwV/V21QoMALVQ+tfuWazcClmoDHr9NNoCIXW6thGk3odA\n1FQRmr+/37IzXcJ/m8aSasX/K06M4cSsEtKOpfJB7tDuAAzAzugk17uhl0C/\n2t31CF49CwjPDX2cFNKuyy1gd7SazVgMjJv1SJI5QhyFBGIBEzVnK9tqiej/\nwpXp/WwoFngRsuZHtwCfnYgO0z9j5R455Ey+vLDk8T1Lcshy1AdfalUsYX2K\nk+qgzXkuUL8zjf52J2HjpO6zyKG+hWiwRefGJ1qaTytjNd8ddJq2UBtmQjb8\n8WsJVHm4yIimHvp9SrcHGn3ZGJ0qDubWHE26E7drmyvzm2I3Zne6zW3obR2c\nMwC8SrDRNYYaPMGmPN17qiA1/PAw5/aHSh4phqhlJLyi5iYujaO0wY8/sDeW\nsKzkppH6IPIYmXdLqQ1naDvQfOwuJCbw6bpU0RLxabAEiBPSFnGl8G9cCFj6\nXp2Ip9cptsUovRXUCpi+liqelMQo/rV/tf3zFOzegp8xuj8NL3fTByL/DaPB\nWe2BbWXuzqDu/9rcWjIQ+u3n53ES4p/CfDoUoNbzL9zR8fSYdiYZKcj7UIyU\nU+LF\r\n=5If8\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"media/icon.png","main":"./dist/mergeConflictMain","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","browser":"./dist/browser/mergeConflictMain","engines":{"vscode":"^1.5.0"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","repository":{"url":"https://github.com/microsoft/vscode.git","type":"git"},"contributes":{"menus":{"editor/title":[{"when":"mergeConflictsCount && mergeConflictsCount != 0","group":"navigation@1","command":"merge-conflict.previous"},{"when":"mergeConflictsCount && mergeConflictsCount != 0","group":"navigation@2","command":"merge-conflict.next"}],"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"icon":"$(arrow-down)","title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"icon":"$(arrow-up)","title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","capabilities":{"virtualWorkspaces":false,"untrustedWorkspaces":{"supported":true}},"_hasShrinkwrap":false,"readmeFilename":"README.md","activationEvents":["onStartupFinished"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.a3fc50b5005_1624495986173_0.26231648043928946","host":"s3://npm-registry-packages"}},"0.3.0-next.1750b2b231b":{"name":"@theia/vscode-builtin-merge-conflict","version":"0.3.0-next.1750b2b231b","license":"MIT","_id":"@theia/vscode-builtin-merge-conflict@0.3.0-next.1750b2b231b","maintainers":[{"name":"theia","email":"theia@typefox.io"}],"dist":{"shasum":"2a547364d744420bfe8e6d3e615c843b163ddfbb","tarball":"https://registry.npmjs.org/@theia/vscode-builtin-merge-conflict/-/vscode-builtin-merge-conflict-0.3.0-next.1750b2b231b.tgz","fileCount":11,"integrity":"sha512-v5ENe9Mv2yLf1gIg/9ZmKisKxa0Fp3OjGMFM4iV7fmqqNUExkgDjkCogAfQNQS/SvtxiR4yeRlQJIDFdAWRVsg==","signatures":[{"sig":"MEQCIEB2y9WRJDtXX41DDU0pov5Hy+v+0b4nX0k6ENaDgNbuAiBg6Y4jdSsSAoJDVsSHIfqHDKinlIc5jouW4eanpG01JQ==","keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA"}],"unpackedSize":107439,"npm-signature":"-----BEGIN PGP SIGNATURE-----\r\nVersion: OpenPGP.js v3.0.13\r\nComment: https://openpgpjs.org\r\n\r\nwsFcBAEBCAAQBQJg1SyXCRA9TVsSAnZWagAAqEQP/A3Yspp+WUAA3qBo6j05\nOyLUwftWwkMIjxUaMsRTftWmfnac/qfnVXSOEzI2gbqUCPBYg/rJxmWhIphA\nr5HmdE69k+S0kpfyAlrcTicC6cq57qhLvL38A/a2vu48nmz+4Mdw+DCYZsnH\n3G7uzTUUQ5yOlUqKYtfdMuzwGZXFEBJcj8aZN7MTX8C0PJW/b7zOyItY8lcW\n17DAlx5NZmejWLSDV9jHXDeVUSrULDqBlcqp9kgs634FZzAMx8BgoBcGlAv3\ne5RiM82nfMDFUVUgqPEWsXvRBmdKso/fxViOwKLGmnRzlo+t37BNwsQ59zbu\nivvTqkIgdsLnQBfq3fXow5FAYP0/2uI8oGzfGYXG7PpQTspasuOecTOVngE2\n750FJTcyvyPEnVpfZXGYSnmSEX0WQXDV3wYp7JvA9ryZFYCS+lBJcnNZQe3Y\n1oyFFsh3cgNF8//Qf7Kgio005Hy9HUJ8sOhkJAhCsDkDq8Bk3pbrMmGOJ8T+\nJJkWwkHGlUr6TQXv7j3KMJih4mk4SkPb+xE5/vIRlDzLRwJuikY8AN/RhBs6\nBZ92wc5u4Vtaq9G5Ll1rM16oCgWgYp4elBC5c99m994hrkl0O+q5LeenSdhr\nvuN4B2nrRIScy4GikqxrtGOmzBgN+CbimSJvcEYhrt+vzlh/0wxff+J6Z2nq\nfu/R\r\n=/SfK\r\n-----END PGP SIGNATURE-----\r\n"},"icon":"media/icon.png","main":"./dist/mergeConflictMain","aiKey":"AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217","readme":"# Merge Conflict\n\n**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.\n\n## Features\n\nSee [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.\n","browser":"./dist/browser/mergeConflictMain","engines":{"vscode":"^1.5.0"},"_npmUser":{"name":"theia","email":"theia@typefox.io"},"publisher":"vscode","categories":["Other"],"deprecated":"Package no longer supported. Use at your own risk. Consider using the vscode built-in extensions pack instead. For example: https://github.com/eclipse-theia/theia-blueprint/blob/4f7e32dd8d3f72a9a9da3271a0ae8312fe1f5e07/applications/electron/package.json#L120","repository":{"url":"https://github.com/microsoft/vscode.git","type":"git"},"contributes":{"menus":{"editor/title":[{"when":"mergeConflictsCount && mergeConflictsCount != 0","group":"navigation@1","command":"merge-conflict.previous"},{"when":"mergeConflictsCount && mergeConflictsCount != 0","group":"navigation@2","command":"merge-conflict.next"}],"scm/resourceState/context":[{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-current"},{"when":"scmProvider == git && scmResourceGroup == merge","group":"1_modification","command":"merge-conflict.accept.all-incoming"}]},"commands":[{"title":"%command.accept.all-current%","command":"merge-conflict.accept.all-current","category":"%command.category%","original":"Accept All Current"},{"title":"%command.accept.all-incoming%","command":"merge-conflict.accept.all-incoming","category":"%command.category%","original":"Accept All Incoming"},{"title":"%command.accept.all-both%","command":"merge-conflict.accept.all-both","category":"%command.category%","original":"Accept All Both"},{"title":"%command.accept.current%","command":"merge-conflict.accept.current","category":"%command.category%","original":"Accept Current"},{"title":"%command.accept.incoming%","command":"merge-conflict.accept.incoming","category":"%command.category%","original":"Accept Incoming"},{"title":"%command.accept.selection%","command":"merge-conflict.accept.selection","category":"%command.category%","original":"Accept Selection"},{"title":"%command.accept.both%","command":"merge-conflict.accept.both","category":"%command.category%","original":"Accept Both"},{"icon":"$(arrow-down)","title":"%command.next%","command":"merge-conflict.next","category":"%command.category%","original":"Next Conflict"},{"icon":"$(arrow-up)","title":"%command.previous%","command":"merge-conflict.previous","category":"%command.category%","original":"Previous Conflict"},{"title":"%command.compare%","command":"merge-conflict.compare","category":"%command.category%","original":"Compare Current Conflict"}],"configuration":{"title":"%config.title%","properties":{"merge-conflict.codeLens.enabled":{"type":"boolean","default":true,"description":"%config.codeLensEnabled%"},"merge-conflict.diffViewPosition":{"enum":["Current","Beside","Below"],"type":"string","default":"Current","description":"%config.diffViewPosition%","enumDescriptions":["%config.diffViewPosition.current%","%config.diffViewPosition.beside%","%config.diffViewPosition.below%"]},"merge-conflict.decorators.enabled":{"type":"boolean","default":true,"description":"%config.decoratorsEnabled%"},"merge-conflict.autoNavigateNextConflict.enabled":{"type":"boolean","default":false,"description":"%config.autoNavigateNextConflictEnabled%"}}}},"description":"%description%","directories":{},"displayName":"%displayName%","capabilities":{"virtualWorkspaces":false,"untrustedWorkspaces":{"supported":true}},"_hasShrinkwrap":false,"readmeFilename":"README.md","activationEvents":["onStartupFinished"],"_npmOperationalInternal":{"tmp":"tmp/vscode-builtin-merge-conflict_0.3.0-next.1750b2b231b_1624583319474_0.9563012999256681","host":"s3://npm-registry-packages"}}},"time":{"created":"2019-03-05T12:54:55.457Z","modified":"2025-09-30T12:12:56.477Z","0.1.0":"2019-03-05T12:54:55.794Z","0.2.0":"2019-07-22T08:30:58.559Z","0.2.1":"2019-07-22T09:07:07.734Z","0.3.0-next.db32534bf1":"2019-11-18T17:01:59.062Z","0.3.0-next.94116da8fa":"2019-11-18T20:39:38.786Z","0.3.0-next.1c9fd8a597":"2019-11-19T00:39:11.661Z","0.3.0-next.782f1592de":"2019-11-19T08:07:34.428Z","0.3.0-next.c9a2de2d9c":"2019-11-19T09:03:37.677Z","0.3.0-next.95d8353abf":"2019-11-20T00:34:49.467Z","0.3.0-next.37f18e8f2d":"2019-11-21T00:33:28.505Z","0.3.0-next.9197d42531":"2019-11-22T00:40:09.700Z","0.3.0-next.2d0b37f031":"2019-11-23T00:40:46.060Z","0.3.0-next.c41d9dc9b4":"2019-11-25T00:37:49.706Z","0.3.0-next.85d3ccfb9e":"2019-11-26T00:40:02.948Z","0.3.0-next.615732feae":"2019-11-27T00:39:52.790Z","0.3.0-next.7cc88f5caa":"2019-11-28T00:38:45.284Z","0.3.0-next.d20be77af2":"2019-11-29T00:33:48.066Z","0.3.0-next.665b576260":"2019-11-30T00:35:13.069Z","0.3.0-next.3295e51f22":"2019-12-01T00:41:33.331Z","0.3.0-next.7cf4cca47a":"2019-12-02T00:37:54.237Z","0.3.0-next.b0fb9f17da":"2019-12-03T00:23:07.320Z","0.3.0-next.9794f2ba37":"2019-12-04T00:22:13.734Z","0.3.0-next.43e3581aa6":"2019-12-04T08:21:12.677Z","0.3.0-next.2111655b67":"2019-12-04T09:07:57.385Z","0.3.0-next.196aeda027":"2019-12-06T00:21:32.902Z","0.3.0-next.a416c77e56":"2019-12-07T00:22:23.013Z","0.3.0-next.2bb6cfc16a":"2019-12-08T00:23:19.911Z","0.3.0-next.cabcace4b5":"2019-12-10T00:22:38.004Z","0.3.0-next.b099d570ed":"2019-12-11T00:21:51.781Z","0.3.0-next.68db7fc3f7":"2019-12-11T16:46:55.906Z","0.3.0-next.007b3032ad":"2019-12-12T00:22:59.876Z","0.3.0-next.b34da611b9":"2019-12-12T12:09:40.649Z","0.3.0-next.608ac23340":"2019-12-13T00:22:38.048Z","0.3.0-next.df57a6157c":"2019-12-14T00:22:35.676Z","0.3.0-next.3dea65ba1b":"2019-12-15T00:22:41.570Z","0.3.0-next.231c6e7762":"2019-12-17T00:22:48.297Z","0.3.0-next.8eb835c463":"2019-12-17T18:30:05.538Z","0.3.0-next.043da28dda":"2019-12-17T20:02:53.594Z","0.3.0-next.eb0ca2626b":"2019-12-18T00:23:25.100Z","0.3.0-next.893369ff8f":"2019-12-19T00:24:41.378Z","0.3.0-next.1fc02159b7":"2019-12-20T00:23:44.360Z","0.3.0-next.c0c4eb6a51":"2019-12-21T00:22:38.202Z","0.3.0-next.d06f0e877c":"2019-12-22T00:22:43.355Z","0.3.0-next.8cddb0bbde":"2019-12-23T00:22:23.534Z","0.3.0-next.656fff3b1e":"2019-12-24T00:23:40.329Z","0.3.0-next.ff5f581425":"2019-12-25T00:23:34.328Z","0.3.0-next.8aa2191271":"2019-12-27T00:20:16.432Z","0.3.0-next.502fe13712":"2019-12-28T00:23:07.179Z","0.3.0-next.d6245d285e":"2019-12-30T00:20:33.011Z","0.3.0-next.79052bb8eb":"2019-12-31T00:24:33.208Z","0.3.0-next.7493a60464":"2020-01-01T00:24:31.703Z","0.3.0-next.672ed38dc8":"2020-01-03T00:24:49.349Z","0.3.0-next.df48af1684":"2020-01-04T00:23:37.319Z","0.3.0-next.ee8eb463a2":"2020-01-06T00:22:30.726Z","0.3.0-next.629a08ed62":"2020-01-07T00:24:16.276Z","0.3.0-next.08d431dc17":"2020-01-08T00:21:43.493Z","0.3.0-next.cb47915e3b":"2020-01-09T00:23:52.740Z","0.3.0-next.f6f9931377":"2020-01-11T00:23:55.661Z","0.3.0-next.71df4b20de":"2020-01-12T00:25:13.957Z","0.3.0-next.22e4d75bd0":"2020-01-13T00:23:42.829Z","0.3.0-next.2bbe9c5330":"2020-01-14T00:23:10.002Z","0.3.0-next.3883ebd061":"2020-01-15T00:24:14.075Z","0.3.0-next.b80e813365":"2020-01-16T00:25:03.895Z","0.3.0-next.ca635ddb28":"2020-01-17T00:23:32.477Z","0.3.0-next.a234f13c45":"2020-01-18T00:22:35.455Z","0.3.0-next.062c54a424":"2020-01-19T00:20:58.490Z","0.3.0-next.e107e5c5bf":"2020-01-20T00:21:44.027Z","0.3.0-next.8884913a17":"2020-01-21T00:22:06.793Z","0.3.0-next.d6fba31514":"2020-01-22T00:19:51.763Z","0.3.0-next.a90aedd5ec":"2020-01-23T00:22:00.469Z","0.3.0-next.b60f43d098":"2020-01-24T00:20:58.358Z","0.3.0-next.3a1e245648":"2020-01-26T00:21:23.981Z","0.3.0-next.3c6f6af734":"2020-01-27T00:20:30.753Z","0.3.0-next.4eab357eb8":"2020-01-28T00:21:08.013Z","0.3.0-next.d99bbafe17":"2020-01-29T00:20:59.374Z","0.3.0-next.2ea221bdda":"2020-01-30T00:20:45.435Z","0.3.0-next.845f5075f1":"2020-01-31T00:21:01.599Z","0.3.0-next.f4786e227c":"2020-02-01T00:20:31.140Z","0.3.0-next.c4309702c5":"2020-02-02T00:19:30.673Z","0.3.0-next.50a7443ae8":"2020-02-03T00:20:07.760Z","0.3.0-next.c52bfa8906":"2020-02-04T00:21:16.911Z","0.3.0-next.967aab8156":"2020-02-05T00:28:46.880Z","0.3.0-next.9f21f67bea":"2020-02-06T00:22:08.029Z","0.3.0-next.7cb5172397":"2020-02-07T00:21:44.654Z","0.3.0-next.b46d35c25c":"2020-02-08T00:22:35.160Z","0.3.0-next.718331d6f3":"2020-02-09T00:25:51.589Z","0.3.0-next.46750df406":"2020-02-10T00:25:22.695Z","0.3.0-next.fc9cc2c397":"2020-02-11T00:25:54.652Z","0.3.0-next.d5aaab5603":"2020-02-12T00:26:00.392Z","0.3.0-next.e4c77cdd6e":"2020-02-13T00:26:25.246Z","0.3.0-next.f8014d4957":"2020-02-14T00:26:06.129Z","0.3.0-next.5c017be321":"2020-02-15T00:26:04.325Z","0.3.0-next.6ec6f9e3f4":"2020-02-16T00:26:19.987Z","0.3.0-next.186354f536":"2020-02-18T00:24:41.665Z","0.3.0-next.9bc92b48d9":"2020-02-19T00:28:11.249Z","0.3.0-next.0c35df5391":"2020-02-20T00:23:55.647Z","0.3.0-next.7fc5d91505":"2020-02-23T00:28:36.539Z","0.3.0-next.07c33977da":"2020-02-24T00:27:39.057Z","0.3.0-next.915089a8aa":"2020-02-25T00:26:50.062Z","0.3.0-next.a0dbbaa455":"2020-02-26T00:25:52.099Z","0.3.0-next.24aeb687f7":"2020-02-27T00:30:08.102Z","0.3.0-next.e5834d3280":"2020-02-28T00:26:03.980Z","0.3.0-next.fc9543ac88":"2020-02-29T00:26:10.415Z","0.3.0-next.77dcee274b":"2020-03-01T00:27:26.178Z","0.3.0-next.215dda4dd9":"2020-03-02T00:27:55.008Z","0.3.0-next.8202955fee":"2020-03-07T00:28:55.006Z","0.3.0-next.6fb14fddac":"2020-03-08T00:26:56.317Z","0.3.0-next.b980d895f7":"2020-03-09T00:29:32.866Z","0.3.0-next.ffcd280b53":"2020-03-10T00:27:41.412Z","0.3.0-next.8c596fbf90":"2020-03-11T00:30:05.025Z","0.3.0-next.1df23554b2":"2020-03-12T00:27:39.482Z","0.3.0-next.9dae408dc3":"2020-03-13T00:28:49.863Z","0.3.0-next.ce55064873":"2020-03-14T00:29:11.556Z","0.3.0-next.839383dc1d":"2020-03-15T00:27:53.045Z","0.3.0-next.078b57357e":"2020-03-16T00:27:38.144Z","0.3.0-next.099a7622e6":"2020-03-17T00:28:52.283Z","0.3.0-next.a8e13f1c84":"2020-03-18T10:25:27.872Z","0.3.0-next.902db3ed0c":"2020-03-19T00:28:15.725Z","0.3.0-next.56660bef36":"2020-03-19T20:11:29.192Z","0.3.0-next.a67cde209b":"2020-03-20T00:28:58.796Z","0.3.0-next.10a7941854":"2020-03-20T18:55:28.600Z","0.3.0-next.2d03b83b60":"2020-03-21T00:24:58.680Z","0.3.0-next.5712574281":"2020-03-22T00:24:08.474Z","0.3.0-next.53054c23b5":"2020-03-24T00:25:29.983Z","0.3.0-next.906729f142":"2020-03-25T00:29:20.320Z","0.3.0-next.ebcc8208f8":"2020-03-26T00:25:05.512Z","0.3.0-next.d2ae19e76f":"2020-03-27T00:29:51.796Z","0.3.0-next.3367ea6000":"2020-03-28T00:25:11.590Z","0.3.0-next.1ec43773e3":"2020-03-29T00:27:03.462Z","0.3.0-next.d05e41bef8":"2020-03-31T00:25:43.717Z","0.3.0-next.3714004cc8":"2020-04-01T00:27:22.473Z","0.3.0-next.7b488119c3":"2020-04-02T00:25:44.296Z","0.3.0-next.30a4ccedba":"2020-04-03T00:25:22.621Z","0.3.0-next.95b39f4b08":"2020-04-04T00:25:45.984Z","0.3.0-next.6fded8a497":"2020-04-05T00:24:24.007Z","0.3.0-next.6526fe0a1a":"2020-04-06T00:23:41.099Z","0.3.0-next.af5ab57bb5":"2020-04-07T00:24:03.307Z","0.3.0-next.52d27e2c92":"2020-04-08T00:19:47.028Z","0.3.0-next.43ae69de18":"2020-04-09T00:23:40.542Z","0.3.0-next.73c5cab420":"2020-04-10T00:26:31.527Z","0.3.0-next.f3ceb33c5c":"2020-04-11T00:22:22.904Z","0.3.0-next.335de3b713":"2020-04-12T00:24:01.416Z","0.3.0-next.304fc630f7":"2020-04-13T00:25:31.385Z","0.3.0-next.e6875340b4":"2020-04-14T00:27:43.672Z","0.3.0-next.221475ef52":"2020-04-15T00:25:39.967Z","0.3.0-next.6903204820":"2020-04-16T00:24:48.144Z","0.3.0-next.7e2e87a813":"2020-04-18T00:24:26.218Z","0.3.0-next.1c3c0713f0":"2020-04-19T00:24:18.498Z","0.3.0-next.ec0d19789f":"2020-04-20T00:24:25.138Z","0.3.0-next.b442c251ac":"2020-04-21T00:25:48.213Z","0.3.0-next.647e0beaaf":"2020-04-22T00:25:15.948Z","0.3.0-next.c622be7731":"2020-04-23T00:24:32.012Z","0.3.0-next.6c9398c3ea":"2020-04-24T00:24:11.598Z","0.3.0-next.7f5bada046":"2020-04-25T00:23:33.173Z","0.3.0-next.f74d109a59":"2020-04-26T00:22:45.047Z","0.3.0-next.d59c4d02c0":"2020-04-27T00:26:03.440Z","0.3.0-next.386c51ddcb":"2020-04-29T00:24:20.664Z","0.3.0-next.7f6f68aeb0":"2020-04-30T00:25:22.693Z","0.3.0-next.d1cd816e33":"2020-05-01T00:25:54.799Z","0.3.0-next.eee5d36cbf":"2020-05-02T00:24:36.329Z","0.3.0-next.dc348340fd":"2020-05-03T00:23:23.254Z","0.3.0-next.b3882f0dfe":"2020-05-04T00:23:32.729Z","0.3.0-next.0838431da9":"2020-05-06T00:25:57.148Z","0.3.0-next.03b322ec44":"2020-05-07T00:25:55.904Z","0.3.0-next.027b6b709c":"2020-05-08T00:25:01.353Z","0.3.0-next.306235b1e6":"2020-05-09T00:24:22.180Z","0.3.0-next.ba33738bb3":"2020-05-11T00:25:58.412Z","0.3.0-next.5aa5fa5f4c":"2020-05-11T21:31:50.921Z","0.3.0-next.6b4258e724":"2020-05-12T00:27:17.449Z","0.3.0-next.8ad9d82890":"2020-05-13T00:28:13.408Z","0.3.0-next.c175ca1129":"2020-05-14T00:27:33.221Z","0.3.0-next.d40066d9cd":"2020-05-14T23:40:33.135Z","0.3.0-next.48539eea8b":"2020-05-15T00:25:40.794Z","0.3.0-next.be61b7d3ab":"2020-05-16T00:26:54.268Z","0.3.0-next.a1fd802669":"2020-05-17T00:26:41.899Z","0.3.0-next.6071a17e88":"2020-05-18T00:27:45.878Z","0.3.0-next.a7fb3ef303":"2020-05-19T00:28:04.227Z","0.3.0-next.d1a59226f2":"2020-05-20T00:27:12.080Z","0.3.0-next.fbb367917c":"2020-05-21T00:25:56.412Z","0.3.0-next.674b549669":"2020-05-22T00:27:39.916Z","0.3.0-next.a1ed386162":"2020-05-23T00:37:43.419Z","0.3.0-next.7e407b5472":"2020-05-26T00:40:02.476Z","0.3.0-next.21d6116577":"2020-05-26T13:31:33.191Z","0.3.0-next.040034f7ae":"2020-05-27T00:40:39.221Z","0.3.0-next.40559425c7":"2020-05-28T00:42:35.292Z","0.3.0-next.028241b160":"2020-05-29T00:34:27.551Z","0.3.0-next.e70bf91f55":"2020-05-30T00:33:19.007Z","0.3.0-next.50f907f0ba":"2020-05-31T00:34:42.728Z","0.3.0-next.79a1f5a5ca":"2020-06-01T00:35:53.087Z","0.3.0-next.ce14facbe7":"2020-06-02T00:36:02.518Z","0.3.0-next.6532cc6c8d":"2020-06-03T00:35:18.534Z","0.3.0-next.d760fde11e":"2020-06-04T00:33:50.650Z","0.3.0-next.11848b40d3":"2020-06-04T22:08:59.790Z","0.3.0-next.6be6bd9151":"2020-06-05T00:37:52.193Z","0.3.0-next.6fef59565b":"2020-06-06T00:35:22.744Z","0.3.0-next.5347e157ef":"2020-06-07T00:37:35.002Z","0.3.0-next.4d6da3154c":"2020-06-08T00:35:16.296Z","0.3.0-next.2aa9854ac4":"2020-06-10T00:36:39.816Z","0.3.0-next.0145e38e5f":"2020-06-11T00:38:40.020Z","0.3.0-next.1a1ab8a435":"2020-06-13T00:35:44.341Z","0.3.0-next.af9d0d5df2":"2020-06-14T00:38:09.893Z","0.3.0-next.288447572":"2020-06-15T00:38:36.469Z","0.3.0-next.9dde49dc78":"2020-06-16T00:34:42.503Z","0.3.0-next.ddb6641923":"2020-06-17T00:36:29.146Z","0.3.0-next.6c68514534":"2020-06-18T00:36:26.892Z","0.3.0-next.8cd3fe080b":"2020-06-19T00:36:45.994Z","0.3.0-next.97650fb8f3":"2020-06-20T00:36:20.405Z","0.3.0-next.9c142ea383":"2020-06-21T00:39:16.129Z","0.3.0-next.fad4d8d254":"2020-06-22T00:36:37.134Z","0.3.0-next.593ee445cf":"2020-06-23T00:37:27.241Z","0.3.0-next.c17ed9ffec":"2020-06-24T00:38:52.800Z","0.3.0-next.c7ea388c7d":"2020-06-25T00:34:44.679Z","0.3.0-next.3158fc0f76":"2020-06-26T00:37:11.169Z","0.3.0-next.04c36be045":"2020-06-27T00:38:12.756Z","0.3.0-next.7923112cdd":"2020-06-29T00:36:16.719Z","0.3.0-next.b26cde750e":"2020-06-30T00:36:18.814Z","0.3.0-next.ef903c70c0":"2020-07-01T00:42:33.308Z","0.3.0-next.5dc7025c1e":"2020-07-02T00:39:08.098Z","0.3.0-next.e38c2d293d":"2020-07-03T00:42:36.074Z","0.3.0-next.ad8c805aa6":"2020-07-04T00:43:02.227Z","0.3.0-next.4e4941b802":"2020-07-05T00:43:18.242Z","0.3.0-next.c50be4449c":"2020-07-07T00:42:46.870Z","0.3.0-next.b9a0407103":"2020-07-08T00:44:12.516Z","0.3.0-next.f37faf6c84":"2020-07-09T00:42:49.182Z","0.3.0-next.ae34596ac2":"2020-07-10T00:44:18.881Z","0.3.0-next.1ca18ed83c":"2020-07-11T00:42:27.765Z","0.3.0-next.3d4ff091be":"2020-07-12T00:43:09.139Z","0.3.0-next.aa930e5619":"2020-07-13T00:46:34.418Z","0.3.0-next.f4d766ca55":"2020-07-14T00:42:34.076Z","0.3.0-next.475076c2c5":"2020-07-15T00:44:16.610Z","0.3.0-next.48f23d838f":"2020-07-16T00:43:18.355Z","0.3.0-next.7099dc0708":"2020-07-17T00:45:07.759Z","0.3.0-next.2c609ec4aa":"2020-07-18T00:42:57.582Z","0.3.0-next.6c21258b65":"2020-07-19T00:46:09.037Z","0.3.0-next.d586f701ec":"2020-07-21T00:45:31.491Z","0.3.0-next.0bf4493b75":"2020-07-22T00:45:14.444Z","0.3.0-next.4a1bcdafe9":"2020-07-22T16:00:00.728Z","0.3.0-next.bae379e986":"2020-07-23T00:44:26.843Z","0.3.0-next.db170566b8":"2020-07-24T00:45:50.543Z","0.3.0-next.c53cc6546f":"2020-07-25T00:43:54.794Z","0.3.0-next.e2de23c683":"2020-07-26T00:45:10.817Z","0.3.0-next.8ca1cf6293":"2020-07-27T00:44:50.214Z","0.3.0-next.feb05f7351":"2020-07-28T00:47:07.698Z","0.3.0-next.3bb6bc5bcd":"2020-07-29T00:45:41.088Z","0.3.0-next.c2224dab6c":"2020-07-30T00:48:41.008Z","0.3.0-next.cf1b357443":"2020-07-31T00:47:10.361Z","0.3.0-next.8d51d4a419":"2020-08-01T00:46:15.215Z","0.3.0-next.eb05e94d5e":"2020-08-02T00:49:04.291Z","0.3.0-next.d5327bca82":"2020-08-03T00:47:31.178Z","0.3.0-next.d933c49a5c":"2020-08-04T00:45:54.069Z","0.3.0-next.c0a100d410":"2020-08-05T00:48:49.715Z","0.3.0-next.3d99a14dc4":"2020-08-06T00:47:17.575Z","0.3.0-next.42a9a9998e":"2020-08-07T00:48:04.832Z","0.3.0-next.11c0b60785":"2020-08-08T00:47:34.480Z","0.3.0-next.6d913c4c14":"2020-08-09T00:50:33.407Z","0.3.0-next.466da1c901":"2020-08-10T00:48:06.588Z","0.3.0-next.9bd54c15ae":"2020-08-11T00:47:24.724Z","0.3.0-next.4585a8cc1d":"2020-08-12T00:47:13.529Z","0.3.0-next.f7f05dee53":"2020-08-13T00:49:27.311Z","0.3.0-next.95b3a0a8a0":"2020-08-14T00:49:47.881Z","0.3.0-next.e0cc8f579f":"2020-08-15T00:47:35.773Z","0.3.0-next.0a22f70e66":"2020-08-16T00:48:35.258Z","0.3.0-next.40a54b0e33":"2020-08-17T00:46:49.754Z","0.3.0-next.624e408a2c":"2020-08-18T00:46:56.711Z","0.3.0-next.f694b07825":"2020-08-19T00:50:35.764Z","0.3.0-next.64d126cafb":"2020-08-20T00:48:51.464Z","0.3.0-next.c85c46579e":"2020-08-21T00:50:00.048Z","0.3.0-next.c50b5acd37":"2020-08-22T00:47:40.549Z","0.3.0-next.ad40702857":"2020-08-23T00:51:22.325Z","0.3.0-next.f57a418b01":"2020-08-24T00:49:33.458Z","0.3.0-next.3ab605c4de":"2020-08-25T00:50:45.992Z","0.3.0-next.0f22246a44":"2020-08-26T00:47:29.265Z","0.3.0-next.b58f4549b2":"2020-08-27T00:50:52.485Z","0.3.0-next.1d7ff4c718":"2020-08-28T00:55:14.381Z","0.3.0-next.c6e64d2217":"2020-08-29T00:33:39.915Z","0.3.0-next.b96ce60e2d":"2020-08-30T00:31:25.610Z","0.3.0-next.61d8097124":"2020-08-31T00:34:06.476Z","0.3.0-next.98fe9425f2":"2020-09-01T00:53:13.368Z","0.3.0-next.c7c6c5cde1":"2020-09-02T00:52:33.927Z","0.3.0-next.7eaf220caf":"2020-09-03T00:54:18.852Z","0.3.0-next.45c70c29e5":"2020-09-04T00:53:35.932Z","0.3.0-next.99f75760b5":"2020-09-05T01:21:46.417Z","0.3.0-next.6c797984fb":"2020-09-06T00:55:18.991Z","0.3.0-next.0d8cc5e56d":"2020-09-07T00:55:24.874Z","0.3.0-next.1d7b32b880":"2020-09-08T00:54:55.408Z","0.3.0-next.f79540dc65":"2020-09-09T00:53:17.649Z","0.3.0-next.03960a5aa1":"2020-09-10T00:50:13.316Z","0.3.0-next.ee11170fef":"2020-09-11T00:51:55.016Z","0.3.0-next.cca20eba89":"2020-09-12T00:50:43.968Z","0.3.0-next.e13875b77c":"2020-09-15T00:57:00.512Z","0.3.0-next.b91c581dd9":"2020-09-16T00:55:12.948Z","0.3.0-next.1343efabed":"2020-09-17T00:54:48.843Z","0.3.0-next.e8572c0221":"2020-09-19T00:55:14.126Z","0.3.0-next.868ad44d0f":"2020-09-20T00:57:22.620Z","0.3.0-next.640385a875":"2020-09-21T00:56:58.633Z","0.3.0-next.677e4bcdc4":"2020-09-22T00:55:58.564Z","0.3.0-next.8d056ce863":"2020-09-23T00:56:23.703Z","0.3.0-next.a1932df627":"2020-09-24T00:58:18.149Z","0.3.0-next.ddc98c3f62":"2020-09-25T00:56:31.520Z","0.3.0-next.5d73637a00":"2020-09-26T00:57:43.852Z","0.3.0-next.a9f87e7ca7":"2020-09-27T00:56:32.220Z","0.3.0-next.772aa0723f":"2020-09-28T00:59:43.993Z","0.3.0-next.b2e7c41d64":"2020-09-29T00:57:36.125Z","0.3.0-next.07589030eb":"2020-09-30T00:55:15.295Z","0.3.0-next.0fc9b25746":"2020-10-01T00:59:22.235Z","0.3.0-next.5052a7bc2e":"2020-10-02T00:57:49.782Z","0.3.0-next.70a31b6a02":"2020-10-03T00:58:02.918Z","0.3.0-next.ed426789c5":"2020-10-04T00:59:43.989Z","0.3.0-next.c7c471bdde":"2020-10-06T01:00:03.496Z","0.3.0-next.1f7ba28bde":"2020-10-07T00:59:05.854Z","0.3.0-next.7a0705650f":"2020-10-08T00:53:28.901Z","0.3.0-next.f5d3ba4d61":"2020-10-09T00:57:48.405Z","0.3.0-next.78db6d0154":"2020-10-11T01:01:48.382Z","0.3.0-next.c0d465ce1c":"2020-10-13T01:02:22.494Z","0.3.0-next.de18f21e99":"2020-10-14T01:01:03.360Z","0.3.0-next.8397461b70":"2020-10-15T01:01:37.036Z","0.3.0-next.89c002ab02":"2020-10-16T01:03:05.424Z","0.3.0-next.c13678f258":"2020-10-17T01:02:42.261Z","0.3.0-next.74ef0a92fe":"2020-10-18T01:04:15.845Z","0.3.0-next.9745766e8e":"2020-10-20T01:02:58.594Z","0.3.0-next.6c8c6008ef":"2020-10-21T01:05:04.675Z","0.3.0-next.9f7a586124":"2020-10-22T01:03:56.851Z","0.3.0-next.274d4a94c1":"2020-10-23T01:02:40.477Z","0.3.0-next.cfe2fd1afc":"2020-10-24T01:05:36.334Z","0.3.0-next.1e0df6a4ac":"2020-10-25T01:07:52.071Z","0.3.0-next.b56b94a7e4":"2020-10-26T01:08:07.315Z","0.3.0-next.15a3164768":"2020-10-27T01:05:27.033Z","0.3.0-next.a9bbd0c09c":"2020-10-28T01:07:28.839Z","0.3.0-next.7210c7246a":"2020-10-29T01:07:28.286Z","0.3.0-next.04863391e9":"2020-10-30T00:46:46.507Z","0.3.0-next.8abfa9bc03":"2020-10-31T00:43:34.992Z","0.3.0-next.5264ab94a3":"2020-11-01T00:48:42.332Z","0.3.0-next.ad1dc7f87a":"2020-11-03T00:45:34.551Z","0.3.0-next.265a2f6424":"2020-11-04T00:46:26.280Z","0.3.0-next.d54c3c67dc":"2020-11-05T20:11:20.487Z","0.3.0-next.93d736db23":"2020-11-06T00:48:16.920Z","0.3.0-next.03c38e6702":"2020-11-07T00:49:32.629Z","0.3.0-next.a2963771d1":"2020-11-08T00:49:22.763Z","0.3.0-next.148b85862a":"2020-11-09T00:52:41.622Z","0.3.0-next.c9bebe2cc9":"2020-11-10T00:49:37.370Z","0.3.0-next.a856e60a0c":"2020-11-11T00:42:23.369Z","0.3.0-next.67817c33a1":"2020-11-12T00:48:19.293Z","0.3.0-next.f47b588736":"2020-11-13T00:46:42.640Z","0.3.0-next.5afc5cd160":"2020-11-14T00:47:59.974Z","0.3.0-next.46ff33b6b6":"2020-11-16T00:48:05.007Z","0.3.0-next.d19c7c52fd":"2020-11-17T00:47:58.583Z","0.3.0-next.d21a51c233":"2020-11-18T00:48:14.615Z","0.3.0-next.b1bc453c55":"2020-11-19T00:50:22.717Z","0.3.0-next.ea4d99921c":"2020-11-20T00:51:03.989Z","0.3.0-next.fb80c0e44a":"2020-11-21T00:50:22.290Z","0.3.0-next.986e1248f6":"2020-11-23T00:52:35.502Z","0.3.0-next.c3e1f0e02a":"2020-11-24T00:50:45.332Z","0.3.0-next.3898e2ced3":"2020-11-25T00:50:39.775Z","0.3.0-next.5f569de4cd":"2020-11-26T00:51:05.670Z","0.3.0-next.1e77bd81d8":"2020-11-27T00:53:28.493Z","0.3.0-next.8ee75c19bb":"2020-11-28T00:53:12.495Z","0.3.0-next.f47aae014c":"2020-11-29T00:56:24.924Z","0.3.0-next.9e5f14c1bc":"2020-12-01T00:56:07.232Z","0.3.0-next.9dba02c075":"2020-12-02T00:55:52.344Z","0.3.0-next.253844006a":"2020-12-03T00:55:04.158Z","0.3.0-next.ff824f2776":"2020-12-04T00:55:30.343Z","0.3.0-next.532ba43c78":"2020-12-05T00:53:52.758Z","0.3.0-next.86d779284b":"2020-12-06T00:57:46.113Z","0.3.0-next.fc9ff5d569":"2020-12-07T00:59:38.943Z","0.3.0-next.91c7834e92":"2020-12-08T00:57:57.910Z","0.3.0-next.82974e8cda":"2020-12-09T00:57:06.116Z","0.3.0-next.79557ebbd2":"2020-12-10T00:58:45.415Z","0.3.0-next.29bc5baadc":"2020-12-11T00:57:18.058Z","0.3.0-next.5954c8366d":"2020-12-12T01:00:01.837Z","0.3.0-next.96b426ef1d":"2020-12-14T00:59:55.722Z","0.3.0-next.14b7df48c3":"2020-12-15T01:00:16.583Z","0.3.0-next.6d3c2e6835":"2020-12-16T00:58:58.468Z","0.3.0-next.d6e8feb774":"2020-12-17T00:59:38.444Z","0.3.0-next.c927a8015b":"2020-12-18T00:57:58.961Z","0.3.0-next.09ca712fe7":"2020-12-19T00:57:26.743Z","0.3.0-next.ec6087fe18":"2020-12-20T01:01:12.636Z","0.3.0-next.6f11d34f67":"2020-12-22T01:02:12.575Z","0.3.0-next.f98fabae6c":"2020-12-23T01:03:36.432Z","0.3.0-next.caaf2a07a9":"2020-12-24T01:06:47.821Z","0.3.0-next.5162c8e856":"2020-12-25T01:05:32.465Z","0.3.0-next.15561c4139":"2020-12-30T01:07:43.556Z","0.3.0-next.7242082983":"2020-12-31T01:10:31.560Z","0.3.0-next.98106c48a0":"2021-01-01T01:14:06.969Z","0.3.0-next.4167837cb8":"2021-01-06T01:12:49.587Z","0.3.0-next.ea1b3f27db":"2021-01-09T01:18:25.746Z","0.3.0-next.3ceb3a100e":"2021-01-10T01:19:06.506Z","0.3.0-next.732d4ff89e":"2021-01-12T01:20:20.451Z","0.3.0-next.b6435bc424":"2021-01-13T01:27:51.217Z","0.3.0-next.710846866f":"2021-01-14T01:35:33.874Z","0.3.0-next.64496f8219":"2021-01-15T01:33:49.661Z","0.3.0-next.2e89c2d4ba":"2021-01-16T01:32:47.526Z","0.3.0-next.eaa959d34b":"2021-01-17T01:32:38.632Z","0.3.0-next.dc58838950":"2021-01-19T01:32:08.917Z","0.3.0-next.f37dd66323":"2021-01-20T01:35:19.733Z","0.3.0-next.9a55eff36f":"2021-01-21T01:33:02.630Z","0.3.0-next.f0bd7eee10":"2021-01-23T01:32:55.062Z","0.3.0-next.79be0a0724":"2021-01-24T01:32:50.946Z","0.3.0-next.d2cbc66835":"2021-01-25T01:32:28.208Z","0.3.0-next.8fa1417e30":"2021-01-26T01:01:26.045Z","0.3.0-next.a56bc0c671":"2021-01-27T01:00:20.173Z","0.3.0-next.e48b3d3cad":"2021-01-28T01:02:00.030Z","0.3.0-next.d27b3130d9":"2021-01-29T01:00:37.609Z","0.3.0-next.81ae94a9dc":"2021-01-30T00:59:01.112Z","0.3.0-next.02d28757e8":"2021-02-01T16:45:52.544Z","0.3.0-next.6fed1b6383":"2021-02-02T00:55:24.829Z","0.3.0-next.3088c27fbd":"2021-02-02T17:45:37.595Z","0.3.0-next.316a1d86e0":"2021-02-03T00:56:30.297Z","0.3.0-next.eac031eedd":"2021-02-04T01:00:11.108Z","0.3.0-next.99f71a032e":"2021-02-05T00:52:29.928Z","0.3.0-next.7323c52084":"2021-02-06T00:51:25.755Z","0.3.0-next.afd102cbd2":"2021-02-07T00:57:43.842Z","0.3.0-next.ff03697a1a":"2021-02-09T00:54:32.802Z","0.3.0-next.9070508076":"2021-02-10T00:52:45.464Z","0.3.0-next.c36a09929c":"2021-02-11T00:53:21.922Z","0.3.0-next.ea865096f1":"2021-02-12T00:52:49.849Z","0.3.0-next.a0e0324a8d":"2021-02-13T00:53:01.427Z","0.3.0-next.a699ffaee6":"2021-02-15T00:54:10.985Z","0.3.0-next.78cb4cfc32":"2021-03-08T19:31:06.134Z","0.3.0-next.c870a55b70":"2021-03-09T00:55:08.728Z","0.3.0-next.d4ee684c8d":"2021-03-10T00:54:33.826Z","0.3.0-next.07d02d3e2b1":"2021-03-11T00:56:53.494Z","0.3.0-next.d31566b57f4":"2021-03-12T00:55:48.892Z","0.3.0-next.3006ac8e940":"2021-03-13T00:55:59.560Z","0.3.0-next.84fe402d655":"2021-03-14T00:59:24.247Z","0.3.0-next.581a659d427":"2021-03-17T00:56:50.310Z","0.3.0-next.4b5354c5f98":"2021-03-20T00:57:11.240Z","0.3.0-next.a3415e669a8":"2021-03-21T01:00:17.762Z","0.3.0-next.0ab3c62ca2a":"2021-03-22T00:57:49.619Z","0.3.0-next.514eefb789e":"2021-03-24T01:00:07.065Z","0.3.0-next.75ed057885c":"2021-03-25T00:43:32.621Z","0.3.0-next.0a7dde45706":"2021-03-26T01:03:28.483Z","0.3.0-next.364923c06b6":"2021-03-27T01:09:18.712Z","0.3.0-next.f453ed8e382":"2021-03-28T01:14:45.199Z","0.3.0-next.c0fa3dfd3e2":"2021-03-29T01:14:32.705Z","0.3.0-next.848e3301a18":"2021-03-29T14:36:05.582Z","0.3.0-next.e09adb28ff4":"2021-03-30T01:11:04.237Z","0.3.0-next.cd52cd7c8d0":"2021-03-31T01:08:54.334Z","0.3.0-next.3fbe95a1cb5":"2021-04-01T01:13:42.614Z","0.3.0-next.4f46f64b437":"2021-04-02T01:19:11.615Z","0.3.0-next.96eaf9dd9b8":"2021-04-03T01:13:04.611Z","0.3.0-next.874d19930e3":"2021-04-04T01:14:03.603Z","0.3.0-next.6d55039842d":"2021-04-06T01:15:04.212Z","0.3.0-next.28a246d9ec5":"2021-04-07T01:12:04.612Z","0.3.0-next.5207b984029":"2021-04-08T01:16:06.946Z","0.3.0-next.2d7ddf5a381":"2021-04-09T01:12:26.160Z","0.3.0-next.a5af80b4bc9":"2021-04-10T01:11:48.035Z","0.3.0-next.01466cf692c":"2021-04-11T01:17:37.922Z","0.3.0-next.eac3821fbf9":"2021-04-13T01:16:13.874Z","0.3.0-next.4ffd6a8d742":"2021-04-14T01:10:30.219Z","0.3.0-next.0a6309be1ee":"2021-04-15T01:12:57.370Z","0.3.0-next.402c9bee093":"2021-04-16T01:12:06.339Z","0.3.0-next.5624d860cc5":"2021-04-17T01:11:41.909Z","0.3.0-next.8e43ae3087e":"2021-04-18T01:14:58.348Z","0.3.0-next.8aff878db25":"2021-04-19T01:13:27.664Z","0.3.0-next.65273f89bc1":"2021-04-20T01:14:36.039Z","0.3.0-next.7947c4d3f88":"2021-04-21T01:12:46.092Z","0.3.0-next.a689b7ec842":"2021-04-22T01:12:56.906Z","0.3.0-next.4853ea69eb4":"2021-04-23T01:14:38.704Z","0.3.0-next.1a46de24eab":"2021-04-24T01:14:30.793Z","0.3.0-next.08d37a85a3f":"2021-04-25T01:17:40.302Z","0.3.0-next.9e9ad5b905f":"2021-04-26T01:15:48.900Z","0.3.0-next.e95ce0a810b":"2021-04-27T01:13:53.367Z","0.3.0-next.27b39a13a00":"2021-04-28T01:14:15.364Z","0.3.0-next.3915fcfe493":"2021-04-29T01:12:26.272Z","0.3.0-next.78577aa18da":"2021-04-30T01:08:20.467Z","0.3.0-next.ee24dbfc6c5":"2021-05-01T01:11:55.548Z","0.3.0-next.c8bd5b211ac":"2021-05-02T01:15:02.784Z","0.3.0-next.dc8bd9cd7e5":"2021-05-03T01:10:56.309Z","0.3.0-next.2e0644918d3":"2021-05-04T01:05:24.355Z","0.3.0-next.cdf318e1e21":"2021-05-05T01:01:08.684Z","0.3.0-next.6d964f3154e":"2021-05-06T01:02:42.173Z","0.3.0-next.f6996f99621":"2021-05-07T01:04:29.852Z","0.3.0-next.2ee59df71eb":"2021-05-08T01:03:06.210Z","0.3.0-next.5979135dbe7":"2021-05-09T01:06:24.842Z","0.3.0-next.54d33cf14cf":"2021-05-10T01:07:11.087Z","0.3.0-next.368c86c3f66":"2021-05-11T01:06:45.195Z","0.3.0-next.ec4babc1987":"2021-05-11T17:42:12.444Z","0.3.0-next.bf24ab16e0a":"2021-05-11T20:28:27.655Z","0.3.0-next.927e791753c":"2021-05-12T01:08:25.179Z","0.3.0-next.1f2077f7e63":"2021-05-13T01:13:04.074Z","0.3.0-next.7e037f8e8fc":"2021-05-14T01:13:22.176Z","0.3.0-next.cfa977755b1":"2021-05-15T01:10:36.571Z","0.3.0-next.82767cc1d7b":"2021-05-16T01:18:28.754Z","0.3.0-next.45aafeb326d":"2021-05-18T01:17:32.208Z","0.3.0-next.bbb89b86f56":"2021-05-19T01:13:22.046Z","0.3.0-next.1ddc623e585":"2021-05-20T01:10:55.749Z","0.3.0-next.3e5faf69c14":"2021-05-21T01:13:34.589Z","0.3.0-next.28767c88f0a":"2021-05-22T01:13:59.916Z","0.3.0-next.5319757634f":"2021-05-23T01:21:59.518Z","0.3.0-next.fe41fcc58d6":"2021-05-25T01:16:33.918Z","0.3.0-next.7d50ce2061e":"2021-05-26T01:27:40.547Z","0.3.0-next.1fd2b4ed1e3":"2021-05-27T01:34:50.708Z","0.3.0-next.970858ef6dd":"2021-05-28T01:47:50.105Z","0.3.0-next.b0862e99074":"2021-05-29T02:03:02.470Z","0.3.0-next.667e3dd844a":"2021-05-30T02:13:53.273Z","0.3.0-next.4f3d865a6b4":"2021-05-31T02:23:37.180Z","0.3.0-next.1e446dfadf5":"2021-06-01T02:47:47.807Z","0.3.0-next.b154a3d3043":"2021-06-02T02:51:36.652Z","0.3.0-next.b2a64b1379c":"2021-06-03T02:28:24.862Z","0.3.0-next.fd2ed91612c":"2021-06-04T02:00:49.780Z","0.3.0-next.ea277806340":"2021-06-05T01:38:13.880Z","0.3.0-next.da65c670632":"2021-06-06T01:31:20.681Z","0.3.0-next.3b01e32ca63":"2021-06-08T01:30:28.435Z","0.3.0-next.6987abd16ed":"2021-06-09T01:11:45.550Z","0.3.0-next.12e7a6a2a39":"2021-06-10T01:12:36.008Z","0.3.0-next.3b4d9757e24":"2021-06-18T18:31:41.836Z","0.3.0-next.c200dc4909a":"2021-06-19T01:06:11.906Z","0.3.0-next.9262b186b97":"2021-06-20T01:07:58.606Z","0.3.0-next.6afedfdad59":"2021-06-21T01:09:45.641Z","0.3.0-next.6446b3a8e5b":"2021-06-21T19:38:21.815Z","0.3.0-next.d301ca55b65":"2021-06-22T01:02:19.904Z","0.3.0-next.96e6d1c933c":"2021-06-22T12:35:17.466Z","0.3.0-next.ad59351c0fa":"2021-06-22T13:41:32.450Z","0.3.0-next.92999c339e2":"2021-06-22T16:13:23.298Z","0.3.0-next.be2ddfaad6d":"2021-06-22T16:51:41.893Z","0.3.0-next.7c78ef3e802":"2021-06-22T17:29:37.064Z","0.3.0-next.fece68a1f4e":"2021-06-23T01:00:17.995Z","0.3.0-next.a3fc50b5005":"2021-06-24T00:53:06.321Z","0.3.0-next.1750b2b231b":"2021-06-25T01:08:39.604Z"},"description":"%description%","maintainers":[{"email":"theia-ide@protonmail.com","name":"eclipsetheia"},{"email":"vincent.fugnitto@ericsson.com","name":"vince-fugnitto"},{"email":"Bernd.hufmann@ericsson.com","name":"bhufmann"},{"email":"marc.dumais@gmail.com","name":"marc.dumais"},{"email":"paul.marechal.0@gmail.com","name":"paul-marechal"},{"email":"mark.sujew@typefox.io","name":"msujew"},{"email":"t.s.maeder@gmail.com","name":"tsmaeder"},{"email":"jfaltermeier@eclipsesource.com","name":"jfaltermeier"},{"email":"jhelming@eclipsesource.com","name":"jhelming"},{"email":"theia-bot@eclipse.org","name":"eclipse-theia-bot"},{"email":"sgraband@eclipsesource.com","name":"sgraband"},{"email":"ndoschek@eclipsesource.com","name":"ndoschek"}],"readme":"","readmeFilename":""}