merge 2

killers525 · Sep 19, 2016 · 64523be · 64523be
1 parent f5e386f
commit 64523be
Showing 1 changed file with 0 additions and 3 deletions.
diff --git a/src/commons.ts b/src/commons.ts
@@ -220,14 +220,11 @@ export class Commons {
         var tempURI: string = this.en.APP_SUMMARY;
 
         console.log("FILE URI For Summary Page : " + tempURI);
-<<<<<<< HEAD
 
         var setting: vscode.Uri = vscode.Uri.parse("untitled:" + tempURI);
-=======
 
         var setting: vscode.Uri = vscode.Uri.file(tempURI);
         fs.openSync(setting.fsPath, 'w');
->>>>>>> f55e607c3ddf5b77e5d4ce7d7e8de77650d7d261
 
         vscode.workspace.openTextDocument(setting).then((a: vscode.TextDocument) => {