mirror of
https://github.com/ckaczor/azuredatastudio.git
synced 2026-03-15 03:21:37 -04:00
* Initial VS Code 1.21 file copy with patches * A few more merges * Post npm install * Fix batch of build breaks * Fix more build breaks * Fix more build errors * Fix more build breaks * Runtime fixes 1 * Get connection dialog working with some todos * Fix a few packaging issues * Copy several node_modules to package build to fix loader issues * Fix breaks from master * A few more fixes * Make tests pass * First pass of license header updates * Second pass of license header updates * Fix restore dialog issues * Remove add additional themes menu items * fix select box issues where the list doesn't show up * formatting * Fix editor dispose issue * Copy over node modules to correct location on all platforms
19 lines
671 B
TypeScript
19 lines
671 B
TypeScript
/*---------------------------------------------------------------------------------------------
|
|
* Copyright (c) Microsoft Corporation. All rights reserved.
|
|
* Licensed under the Source EULA. See License.txt in the project root for license information.
|
|
*--------------------------------------------------------------------------------------------*/
|
|
|
|
import * as vscode from 'vscode';
|
|
import MergeConflictServices from './services';
|
|
|
|
export function activate(context: vscode.ExtensionContext) {
|
|
// Register disposables
|
|
const services = new MergeConflictServices(context);
|
|
services.begin();
|
|
context.subscriptions.push(services);
|
|
}
|
|
|
|
export function deactivate() {
|
|
}
|
|
|