Skip to content

Commit 2622188

Browse files
committed
Remove unused import
1 parent e357305 commit 2622188

File tree

1 file changed

+4
-0
lines changed

1 file changed

+4
-0
lines changed

src/diffpy/pdfmorph/pdfmorphpy.py

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,12 @@
11
#!/usr/bin/env python
22

3+
<<<<<<< Updated upstream
34
from pathlib import Path
45

56
from diffpy.pdfmorph.pdfmorphapp import create_option_parser, multiple_morphs, multiple_targets, single_morph
7+
=======
8+
from diffpy.pdfmorph.pdfmorphapp import create_option_parser, single_morph, multiple_targets, multiple_morphs
9+
>>>>>>> Stashed changes
610

711

812
def pdfmorph(file1, file2, **kwargs):

0 commit comments

Comments
 (0)