temp [ci skip]

Author: benfdking

vscode/extension/src/extension.ts

@@ -12,7 +12,11 @@ import { AuthenticationProviderTobikoCloud } from './auth/auth'
 import { signOut } from './commands/signout'
 import { signIn } from './commands/signin'
 import { signInSpecifyFlow } from './commands/signinSpecifyFlow'
+<<<<<<< HEAD
 import { isErr } from '@bus/result'
+=======
+import { isErr } from '../../bus/src/result'
+>>>>>>> 7a972d4e (temp [ci skip])
 import {
   handleNotSginedInError,
   handleSqlmeshLspNotFoundError,

vscode/extension/src/web-server/server.ts

@@ -1,5 +1,5 @@
 import { ChildProcess, spawn } from 'child_process'
-import { err, isErr, ok, Result } from '../utilities/functional/result'
+import { err, isErr, ok, Result } from '../../../bus/src/result'
 import { sqlmesh_exec } from '../utilities/sqlmesh/sqlmesh'
 import * as vscode from 'vscode'
 import { isProduction } from '../utilities/isDev'