Skip to content

Commit b80c64b

Browse files
timkpainetimkpaine
committed
fix conflicts
1 parent 662337a commit b80c64b

File tree

3 files changed

+0
-151
lines changed

3 files changed

+0
-151
lines changed

‎Cargo.lock‎

Lines changed: 0 additions & 61 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Cargo.toml‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,6 @@ crate-type = ["cdylib"]
1212
[dependencies]
1313
python_template_rust = { path = "./rust", version = "*" }
1414
pyo3 = { version = "0.26", features = ["abi3-py39", "extension-module", "multiple-pymethods"] }
15-
<<<<<<< before updating
16-
strum = "0.27.2"
17-
=======
18-
>>>>>>> after updating
1915

2016
[profile.release]
2117
panic = 'abort'

‎rust/Cargo.lock‎

Lines changed: 0 additions & 86 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)