Resolved conflicts

Signed-off-by: SanthoshiBoyina <[email protected]>
zowe · Oct 19, 2023 · 14ebbc8 · 14ebbc8
1 parent f8559cc
commit 14ebbc8
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/packages/zowe-explorer/src/globals.ts b/packages/zowe-explorer/src/globals.ts
@@ -35,7 +35,7 @@ export let DS_DIR: string;
 export let CONFIG_PATH; // set during activate
 export let ISTHEIA = false; // set during activate
 export let LOG: imperative.Logger;
-export const COMMAND_COUNT = 114;
+export const COMMAND_COUNT = 115;
 export const MAX_SEARCH_HISTORY = 5;
 export const MAX_FILE_HISTORY = 10;
 export const MS_PER_SEC = 1000;