Changes between Version 5 and Version 6 of Help/Concepts/Conflict


Ignore:
Timestamp:
2009-10-06T23:17:34+02:00 (16 years ago)
Author:
Gubaer
Comment:

--

Legend:

Unmodified
Added
Removed
Modified

  • Help/Concepts/Conflict

    v5 v6  
    2727
    2828JOSM can't resolve this automatically. It creates a '''conflict'''. Typically JOSM displays an error message as follows:
     29[[br]]
     30[[Image(conflict-upload-data.png)]]
    2931
    3032