Ignore:
Timestamp:
2010-01-31T18:15:15+01:00 (10 years ago)
Author:
stoecker
Message:

close #4458 - text fixes - patch by Andre

File:
1 edited

Legend:

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

    r2845 r2915  
    8383     * Adds a conflict to the collection of conflicts.
    8484     *
    85      * @param conflict the conflict to to add. Must not be null.
     85     * @param conflict the conflict to add. Must not be null.
    8686     * @throws IllegalArgumentException thrown, if conflict is null
    8787     * @throws IllegalStateException thrown if this collection already includes a conflict for conflict.getMy()
Note: See TracChangeset for help on using the changeset viewer.