diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2017-10-10 18:44:34 +0200 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2017-10-10 18:44:34 +0200 |
| commit | 322418dc502f2157e36f195b6d757f2aa92b32b0 (patch) | |
| tree | daf9c406be228607487439908721cee459e9ef03 /archaeological_finds/models.py | |
| parent | c1ac27b407f11bae18a8180e82638562e99f913b (diff) | |
| parent | 929a7a1512d93c4548fbe6d5aa029ab366c171be (diff) | |
| download | Ishtar-322418dc502f2157e36f195b6d757f2aa92b32b0.tar.bz2 Ishtar-322418dc502f2157e36f195b6d757f2aa92b32b0.zip | |
Merge branch 'develop'
Diffstat (limited to 'archaeological_finds/models.py')
| -rw-r--r-- | archaeological_finds/models.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/archaeological_finds/models.py b/archaeological_finds/models.py index ab3686f08..2f7c547b8 100644 --- a/archaeological_finds/models.py +++ b/archaeological_finds/models.py @@ -1,14 +1,14 @@ from archaeological_finds.models_finds import MaterialType, ConservatoryState,\ - PreservationType, IntegrityType, RemarkabilityType, ObjectType, BaseFind, \ + IntegrityType, RemarkabilityType, ObjectType, BaseFind, \ FindBasket, Find, FindSource, Property, CHECK_CHOICES, BatchType, \ BFBulkView, FBulkView, FirstBaseFindView, AlterationType, \ - AlterationCauseType, TreatmentEmergencyType -from archaeological_finds.models_treatments import TreatmentType, Treatment, \ + AlterationCauseType, TreatmentEmergencyType, TreatmentType +from archaeological_finds.models_treatments import Treatment, \ AbsFindTreatments, FindUpstreamTreatments, FindDownstreamTreatments, \ FindTreatments, TreatmentSource, TreatmentFile, TreatmentFileType, \ TreatmentFileSource, TreatmentState -__all__ = ['MaterialType', 'ConservatoryState', 'PreservationType', +__all__ = ['MaterialType', 'ConservatoryState', 'IntegrityType', 'RemarkabilityType', 'ObjectType', 'BaseFind', 'FindBasket', 'Find', 'FindSource', 'Property', 'BFBulkView', 'FBulkView', 'FirstBaseFindView', 'AlterationType', |