Merge branch 'bugfix/dubious-fn'

BananaAcid · Apr 23, 2020 · db648ff · db648ff
2 parents c17fb6a + 3b36d17
commit db648ff
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 6 deletions.
diff --git a/vscode-extension/package.json b/vscode-extension/package.json
@@ -73,7 +73,6 @@
     "*",
     "onCommand:extension.openInBrowser",
     "onCommand:extension.closePort",
-    "onCommand:extension.makeRequest",
     "onCommand:extension.compileFile"
   ],
   "main": "./out/extension.js",
@@ -87,10 +86,6 @@
         "command": "extension.closePort",
         "title": "Close Port"
       },
-      {
-        "command": "extension.makeRequest",
-        "title": "Make Request"
-      },
       {
         "command": "extension.compileFile",
         "title": "Compile File(s)"

diff --git a/vscode-extension/src/extension.ts b/vscode-extension/src/extension.ts
@@ -270,6 +270,7 @@ export function activate(context: vscode.ExtensionContext) {
       }
     }
   );
+<<<<<<< HEAD
   let makeRequest = vscode.commands.registerCommand(
     "extension.makeRequest",
     async () => {
@@ -285,6 +286,8 @@ export function activate(context: vscode.ExtensionContext) {
       });*/
     }
   );
+=======
+>>>>>>> bugfix/dubious-fn
   let compileFile = vscode.commands.registerCommand(
     "extension.compileFile",
     path => {
@@ -297,7 +300,6 @@ export function activate(context: vscode.ExtensionContext) {
 
   context.subscriptions.push(openInBrowser);
   context.subscriptions.push(closePort);
-  context.subscriptions.push(makeRequest);
   context.subscriptions.push(compileFile);
   vscode.workspace.onDidSaveTextDocument(document => {
     const { fileName } = document;