Ignore:
Timestamp:
2009-08-11T13:23:06+02:00 (12 years ago)
Author:
Gubaer
Message:

Moved package org.openstreetmap.josm.gui.conflict to org.openstreetmap.josm.gui.conflict.pair

Location:
trunk/test/unit/org/openstreetmap/josm/gui/conflict/tags
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/test/unit/org/openstreetmap/josm/gui/conflict/tags/TagMergeItemTest.java

    r1654 r1954  
    44import org.junit.*;
    55import org.openstreetmap.josm.data.osm.Node;
    6 import org.openstreetmap.josm.gui.conflict.MergeDecisionType;
    7 import org.openstreetmap.josm.gui.conflict.tags.TagMergeItem;
     6import org.openstreetmap.josm.gui.conflict.pair.MergeDecisionType;
     7import org.openstreetmap.josm.gui.conflict.pair.tags.TagMergeItem;
    88
    99import static org.junit.Assert.*;
  • trunk/test/unit/org/openstreetmap/josm/gui/conflict/tags/TagMergeModelTest.java

    r1654 r1954  
    1212import org.junit.Test;
    1313import org.openstreetmap.josm.data.osm.Node;
    14 import org.openstreetmap.josm.gui.conflict.MergeDecisionType;
     14import org.openstreetmap.josm.gui.conflict.pair.MergeDecisionType;
     15import org.openstreetmap.josm.gui.conflict.pair.tags.TagMergeItem;
     16import org.openstreetmap.josm.gui.conflict.pair.tags.TagMergeModel;
    1517
    1618public class TagMergeModelTest {
Note: See TracChangeset for help on using the changeset viewer.