Fix merge conflict

openforcefield · Nov 14, 2022 · f3ba738 · f3ba738
1 parent b0007f0
commit f3ba738
Showing 1 changed file with 1 addition and 8 deletions.
diff --git a/openff/qcsubmit/results/caching.py b/openff/qcsubmit/results/caching.py
@@ -7,18 +7,11 @@
 import numpy
 from cachetools import Cache, LRUCache
 from openff.toolkit.topology import Molecule
-<<<<<<< HEAD
+from openff.units import unit
 from qcportal import PortalClient
 from qcportal.molecules import Molecule as QCMolecule
 from qcportal.records import TorsiondriveRecord
 from qcportal.records import OptimizationRecord, BaseRecord, SinglepointRecord
-=======
-from openff.units import unit
-from qcportal import FractalClient
-from qcportal.models import Molecule as QCMolecule
-from qcportal.models import TorsionDriveRecord
-from qcportal.models.records import OptimizationRecord, RecordBase, ResultRecord
->>>>>>> upstream/toolkit_011_support
 
 if TYPE_CHECKING:
     from openff.qcsubmit.results.results import (