Fix: cli index.ts

keyshade-xyz · Sep 16, 2024 · 59b596b · 59b596b
1 parent d06b385
commit 59b596b
Show file tree

Hide file tree

Showing 2 changed files with 19,194 additions and 11 deletions.
diff --git a/apps/cli/src/index.ts b/apps/cli/src/index.ts
@@ -1,17 +1,10 @@
 import { Command } from 'commander'
-<<<<<<< HEAD
 import type BaseCommand from './commands/base.command'
 import InitCommand from './commands/init.command'
 import RunCommand from './commands/run.command'
 import ProfileCommand from './commands/profile.command'
 import EnvironmentCommand from './commands/environment.command'
-=======
-import type BaseCommand from '@/commands/base.command'
-import ProfileCommand from '@/commands/profile.command'
-import InitCommand from '@/commands/init.command'
-import RunCommand from '@/commands/run.command'
 import ScanCommand from '@/commands/scan.command'
->>>>>>> c02e1d1 (feat(cli): add secret scan)
 
 const program = new Command()
 
@@ -23,11 +16,8 @@ const COMMANDS: BaseCommand[] = [
   new RunCommand(),
   new InitCommand(),
   new ProfileCommand(),
-<<<<<<< HEAD
-  new EnvironmentCommand()
-=======
+  new EnvironmentCommand(),
   new ScanCommand()
->>>>>>> c02e1d1 (feat(cli): add secret scan)
 ]
 
 COMMANDS.forEach((command) => {