Switch back to generic message and add azure-deploy to coflicting ext…

…ensions Signed-off-by: Josh Pinkney <[email protected]>
redhat-developer · Dec 22, 2020 · 803873f · 803873f
1 parent 5e7cf50
commit 803873f
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/src/extensionConflicts.ts b/src/extensionConflicts.ts
@@ -5,7 +5,7 @@
 import { commands, Extension, extensions, window } from 'vscode';
 
 // A set of VSCode extension ID's that conflict with VSCode-YAML
-const conflictingIDs = new Set(['vscoss.vscode-ansible']);
+const conflictingIDs = new Set(['vscoss.vscode-ansible', 'ms-vscode-deploy-azure.azure-deploy']);
 
 /**
  * Get all of the installed extensions that currently conflict with VSCode-YAML