fixed leftover conflict marker and blank line EOF errors, trailing wh…#53
Merged
sbillinge merged 1 commit intodiffpy:masterfrom Dec 1, 2022
chloeann95:issue42
Merged
fixed leftover conflict marker and blank line EOF errors, trailing wh…#53sbillinge merged 1 commit intodiffpy:masterfrom chloeann95:issue42
sbillinge merged 1 commit intodiffpy:masterfrom
chloeann95:issue42
