Skip to content

Commit 2958785

Browse files
committed
conflict resolution
2 parents 307fc28 + 2df7a1b commit 2958785

1 file changed

Lines changed: 1 addition & 1 deletion

File tree

.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
.deps/
1414
.dirstamp
1515
.libs/
16-
.idea
16+
.idea/
1717
/config.inc
1818
/doxygen_html
1919
/efpmd/libff/libtinker.a

0 commit comments

Comments
 (0)