Ignore:
Timestamp:
Sep 24, 2009, 6:47:45 PM (15 years ago)
Author:
KOBAYASHI, Shinji
Message:

adjust some conflict

File:
1 edited

Legend:

Unmodified
Added
Removed

  • ruby/trunk/lib/models/tests/rm/test_data_structure.rb

    r291 r292  
    33require 'rm'
    44
    5 <<<<<<< .working
    6 include OpenEHR::RM::Data_Structures
    7 =======
    85include OpenEHR::RM::Data_Structures
    96include OpenEHR::RM::Data_Structures::Item_Structure
    10 >>>>>>> .merge-right.r168
     7
    118
    129class RmDataStructureTest < Test::Unit::TestCase
Note: See TracChangeset for help on using the changeset viewer.