Resolved missed merge conflict

coasys · Apr 23, 2024 · da12c40 · da12c40
1 parent 5726f74
commit da12c40
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/rust-executor/Cargo.toml b/rust-executor/Cargo.toml
@@ -1,10 +1,6 @@
 [package]
 name = "ad4m-executor"
-<<<<<<< HEAD
-version = "0.9.0-rc9"
-=======
 version = "0.9.1-prerelease"
->>>>>>> dev
 edition = "2021"
 authors = ["Nicolas Luck <[email protected]>"]
 description = "Runtime implementation of AD4M as library - https://ad4m.dev"