Changeset 14031 in josm for trunk/test/unit/org


Ignore:
Timestamp:
2018-07-15T13:09:29+02:00 (6 years ago)
Author:
michael2402
Message:

See #16388: Fix broken merge.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/test/unit/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditorTest.java

    r14030 r14031  
    44import static org.junit.Assert.assertNotNull;
    55import static org.junit.Assert.assertNull;
    6 import static org.junit.Assert.assertSame;
    76
    87import java.util.Collections;
     
    114113        assertNotNull(top);
    115114        assertNotNull(tagEditorPanel.getModel());
    116         assertNotNull(tagModel);
    117         assertSame(memberTableModel, memberTable.getModel());
    118         assertSame(selectionTableModel, selectionTable.getModel());
    119115    }
    120116}
Note: See TracChangeset for help on using the changeset viewer.