resolve conflict

Signed-off-by: Kosuke Morimoto <[email protected]>
vdaas · Sep 4, 2024 · 66a1753 · 66a1753
1 parent f2d4fdf
commit 66a1753
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 21 deletions.
diff --git a/rust/Cargo.lock b/rust/Cargo.lock
diff --git a/rust/Cargo.toml b/rust/Cargo.toml
@@ -14,9 +14,6 @@
 # limitations under the License.
 #
 [workspace]
-<<<<<<< HEAD
-members = ["libs/proto", "libs/ngt", "libs/ngt-rs", "bin/agent"]
-=======
 members = [
 	"libs/observability",
 	"libs/proto",
@@ -25,4 +22,3 @@ members = [
 	"libs/algorithms/ngt",
 	"libs/algorithms/faiss",
 ]
->>>>>>> b17cc73a0 (modify rust package structure (#2586))