Skip to content

Commit 28e74e1

Browse files
esoteric-ephemeraesoteric-ephemera
committed
resolve merge conflicts
1 parent d6ae5c2 commit 28e74e1

File tree

1 file changed

+0
-1
lines changed

1 file changed

+0
-1
lines changed

‎tests/client/materials/test_alloys.py‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33
import pytest
44

5-
65
try:
76
import pymatgen.analysis.alloys
87
except ImportError:

0 commit comments

Comments
 (0)