[152] Merge conflict resolutions

[svn@openehr.org]

Revision: 152
Author:   tim.cook
Date:     2008-08-01 10:27:33 +0100 (Fri, 01 Aug 2008)

Log Message:
-----------
Merge conflict resolutions

Modified Paths:
--------------
    
TRUNK/oship/src/oship/openehr/am/archetype/constraintmodel/interfaces/cattribute.py
    
TRUNK/oship/src/oship/openehr/am/archetype/constraintmodel/interfaces/ccomplexobject.py
    
TRUNK/oship/src/oship/openehr/am/archetype/ontology/interfaces/archetypeontology.py
    
TRUNK/oship/src/oship/openehr/am/openehrprofile/datatypes/text/interfaces/ccodephrase.py
    
TRUNK/oship/src/oship/openehr/rm/common/archetyped/interfaces/feederaudit.py
    
TRUNK/oship/src/oship/openehr/rm/common/archetyped/interfaces/link.py
    
TRUNK/oship/src/oship/openehr/rm/common/archetyped/interfaces/locatable.py
    
TRUNK/oship/src/oship/openehr/rm/common/generic/interfaces/participation.py
    
TRUNK/oship/src/oship/openehr/rm/common/generic/interfaces/partyproxy.py
    
TRUNK/oship/src/oship/openehr/rm/datastructures/history/interfaces/event.py
    
TRUNK/oship/src/oship/openehr/rm/datastructures/history/interfaces/history.py
    
TRUNK/oship/src/oship/openehr/rm/datastructures/itemstructure/interfaces/itemlist.py
    
TRUNK/oship/src/oship/openehr/rm/datastructures/itemstructure/interfaces/itemtable.py
    
TRUNK/oship/src/oship/openehr/rm/datastructures/itemstructure/interfaces/itemtree.py
    TRUNK/oship/src/oship/openehr/rm/datatypes/quantity/dvinterval.py
    
TRUNK/oship/src/oship/openehr/rm/datatypes/quantity/interfaces/dvordered.py
    
TRUNK/oship/src/oship/openehr/rm/datatypes/quantity/interfaces/referencerange.py
    
TRUNK/oship/src/oship/openehr/rm/datatypes/text/interfaces/dvcodedtext.py
    TRUNK/oship/src/oship/openehr/rm/datatypes/text/interfaces/dvtext.py
    
TRUNK/oship/src/oship/openehr/rm/ehr/composition/content/entry/interfaces/instruction.py

Removed Paths:
-------------
    
TRUNK/oship/src/oship/import_adl/openEHR-EHR-ACTION.disposition.v1draft.adl
    
TRUNK/oship/src/oship/import_adl/openEHR-EHR-CLUSTER.auscultation.v1.adl
    
TRUNK/oship/src/oship/import_adl/openEHR-EHR-COMPOSITION.discharge.v1draft.adl
    
TRUNK/oship/src/oship/import_adl/openEHR-EHR-EVALUATION.check_list-condition-third_party.v1.adl
    
TRUNK/oship/src/oship/import_adl/openEHR-EHR-EVALUATION.risk-maternity.v1.adl
    
TRUNK/oship/src/oship/import_adl/openEHR-EHR-INSTRUCTION.disposition.v1draft.adl
    
TRUNK/oship/src/oship/import_adl/openEHR-EHR-ITEM_TREE.disposition.v1draft.adl
    
TRUNK/oship/src/oship/import_adl/openEHR-EHR-OBSERVATION.anaesthetic.v1draft.adl
    
TRUNK/oship/src/oship/import_adl/openEHR-EHR-OBSERVATION.blood_pressure.v3.adl
    
TRUNK/oship/src/oship/import_adl/openEHR-EHR-SECTION.antenatal_booking.v1draft.adl


_______________________________________________
ref_impl_python mailing list
ref_impl_python@openehr.org
http://lists.chime.ucl.ac.uk/mailman/listinfo/ref_impl_python