workspace mode in CI

kwilteam · Oct 13, 2023 · c4b2347 · c4b2347
1 parent d431c37
commit c4b2347
Showing 1 changed file with 1 addition and 9 deletions.
diff --git a/go.work.example b/go.work.example
@@ -1,8 +1,4 @@
-<<<<<<< HEAD
 go 1.21
-=======
-go 1.21.2
->>>>>>> cdc2e23e (establish app and sdk package isolation with core submodule (these can all move))
 
 use (
 	.
@@ -11,10 +7,6 @@ use (
 	./test
 )
 
-<<<<<<< HEAD
 // replace github.com/kwilteam/kuneiform => ../kuneiform
-=======
-replace github.com/kwilteam/kuneiform => ../kuneiform
->>>>>>> cdc2e23e (establish app and sdk package isolation with core submodule (these can all move))
 // replace github.com/kwilteam/kwil-extensions => ../../kwil-extensions
-// replace github.com/cometbft/cometbft => ../../../github/cometbft/cometbft
+// replace github.com/cometbft/cometbft => ../../../github/cometbft/cometbft