Skip to content

Commit 1280e21

Browse files
committed
Merge branch 'master' into feature/libListReorg
2 parents dea0c2f + c388c35 commit 1280e21

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

CONTRIBUTING.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,4 +61,5 @@ Thanks so much to everyone [who has contributed](https://github.com/codefori/vsc
6161
* [@Detrytus59](https://github.com/Detrytus59)
6262
* [@janfh](https://github.com/janfh)
6363
* [@MohitKambli](https://github.com/MohitKambli)
64-
* [@bspotswood](https://github.com/bspotswood)
64+
* [@bspotswood](https://github.com/bspotswood)
65+
* [@dcmcdoug](https://github.com/dcmcdoug)

src/instantiate.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,6 @@ export async function safeDisconnect(): Promise<boolean> {
6060
export async function loadAllofExtension(context: vscode.ExtensionContext) {
6161
// No connection when the extension is first activated
6262
vscode.commands.executeCommand(`setContext`, `code-for-ibmi:connected`, false);
63-
vscode.workspace.getConfiguration().update(`workbench.editor.enablePreview`, false, true);
6463

6564
instance = new Instance(context);
6665
context.subscriptions.push(

webpack.config.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ const dist = path.resolve(__dirname, `dist`);
2727

2828
fs.mkdirSync(dist, {recursive: true});
2929

30-
const files = [{relative: `src/components/cqsh/cqsh`, name: `cqsh_1`}];
30+
const files = [{relative: `src/api/components/cqsh/cqsh`, name: `cqsh_1`}];
3131

3232
for (const file of files) {
3333
const src = path.resolve(__dirname, file.relative);

0 commit comments

Comments
 (0)