ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-04-01 17:40:30 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge from master

Browse Source
This commit is contained in:
Raj Musuku
2019-02-21 17:56:04 -08:00
parent 5a146e34fa
commit 666ae11639
11482 changed files with 119352 additions and 255574 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
extensions/merge-conflict/src/interfaces.ts
View File

@@ -11,7 +11,7 @@ export interface IMergeRegion {
decoratorContent: vscode.Range;
}
export enum CommitType {
export const enum CommitType {
Current,
Incoming,
Both