Fix merge issues

20aea5d7 · Sandeep Somavarapu · 7e94116d · 20aea5d7
显示空白变更内容
内联并排

Showing with 0 addition and 1 deletion

src/vs/vscode.proposed.d.ts src/vs/vscode.proposed.d.ts +0 -1

未找到文件。
--- a/src/vs/vscode.proposed.d.ts
+++ b/src/vs/vscode.proposed.d.ts
@@ -107,7 +107,6 @@ declare module 'vscode' {

 	}

->>>>>>> Add documentation for proposed configuration api
 	export namespace window {

 		export function sampleFunction(): Thenable<any>;