Skip to content

Commit 4f80475

Browse files
authored
Update README.md
1 parent 5e6c4ae commit 4f80475

File tree

1 file changed

+0
-3
lines changed

1 file changed

+0
-3
lines changed

README.md

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ Hatch plugin for Rust builds
99

1010
## Overview
1111

12-
<<<<<<< before updating
1312
A simple, extensible Rust build plugin for [hatch](https://hatch.pypa.io/latest/).
1413

1514
```toml
@@ -19,7 +18,5 @@ path = "."
1918
module = "project"
2019
```
2120

22-
=======
23-
>>>>>>> after updating
2421
> [!NOTE]
2522
> This library was generated using [copier](https://copier.readthedocs.io/en/stable/) from the [Base Python Project Template repository](https://github.com/python-project-templates/base).

0 commit comments

Comments
 (0)