Skip to content

Commit ab7b0d3

Browse files
authored
Resolve merge conflict (#5678)
1 parent 69be079 commit ab7b0d3

File tree

1 file changed

+0
-4
lines changed

1 file changed

+0
-4
lines changed

README.md

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -137,12 +137,8 @@ Start a new project with `cargo new` and add `pyo3` to the `Cargo.toml` like th
137137

138138
```toml
139139
[dependencies.pyo3]
140-
<<<<<<< HEAD
141140
version = "0.27.2"
142-
=======
143-
version = "0.27.1"
144141
# Enabling this cargo feature will cause PyO3 to start a Python interpreter on first call to `Python::attach`
145-
>>>>>>> main
146142
features = ["auto-initialize"]
147143
```
148144

0 commit comments

Comments
 (0)