Changeset 295


Ignore:
Timestamp:
Sep 24, 2009, 8:38:01 PM (11 years ago)
Author:
KOBAYASHI, Shinji
Message:

merge error

Location:
ruby/trunk
Files:
2 edited
2 copied

Legend:

Unmodified
Added
Removed
  • ruby/trunk/lib/open_ehr/rm/common/directory.rb

    r167 r295  
    22# http://www.openehr.org/uml/release-1.0.1/Browsable/_9_5_1_76d0249_1140536622627_218703_7149Report.html
    33# Ticket refs #63
    4 include OpenEhr::RM::DataTypes::Text
    5 module OpenEhr
     4include OpenEHR::RM::DataTypes::Text
     5module OpenEHR
    66  module RM
    77    module Common
    88      module Directory
    9         class Folder < OpenEhr::RM::Common::Archetyped::Locatable
     9        class Folder < OpenEHR::RM::Common::Archetyped::Locatable
    1010          attr_accessor :items
    1111          attr_reader :folders
     
    2222          end
    2323        end       
    24         class VersionedFolder < OpenEhr::RM::Common::ChangeControl::VersionedObject
     24        class VersionedFolder < OpenEHR::RM::Common::ChangeControl::VersionedObject
    2525        end
    2626      end # of Directory
  • ruby/trunk/lib/open_ehr/rm/support/measurement.rb

    r167 r295  
    1 module OpenEhr
     1module OpenEHR
    22  module RM
    33    module Support
Note: See TracChangeset for help on using the changeset viewer.