Skip to content

Commit 954e42b

Browse files
committed
fix: resolve merge conflict in pyproject.toml (keep docformatter exclude)
2 parents 52edc71 + 451da4d commit 954e42b

File tree

1 file changed

+0
-7
lines changed

1 file changed

+0
-7
lines changed

.gitignore

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -91,10 +91,3 @@ target/
9191

9292
# Ipython Notebook
9393
.ipynb_checkpoints
94-
95-
# version information
96-
setup.cfg
97-
/src/diffpy/*/version.cfg
98-
99-
# Rever
100-
rever/

0 commit comments

Comments
 (0)