Ignore:
Timestamp:
2009-09-27T16:29:21+02:00 (10 years ago)
Author:
Gubaer
Message:

fixed #3249: Resolve conflicts between invisible and deleted primitives automatically

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/org/openstreetmap/josm/data/conflict/Conflict.java

    r1911 r2198  
    66/**
    77 * Represents a conflict between two {@see OsmPrimitive}s. It is represented as
    8  * a pair if {@see OsmPrimitive} where one element of the pair has the role <em>my</em>
     8 * a pair of {@see OsmPrimitive}s where one element of the pair has the role <em>my</em>
    99 * and the other has the role <em>their</em>.
    1010 * <ul>
Note: See TracChangeset for help on using the changeset viewer.