Changeset 8512 in josm for trunk/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java
- Timestamp:
- 2015-06-21T01:13:09+02:00 (9 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java
r8510 r8512 176 176 * 177 177 */ 178 private finalvoid resolve() {178 private void resolve() { 179 179 if (conflicts == null || model.getSize() == 0) return; 180 180 … … 197 197 * refreshes the view of this dialog 198 198 */ 199 public finalvoid refreshView() {199 public void refreshView() { 200 200 OsmDataLayer editLayer = Main.main.getEditLayer(); 201 201 conflicts = (editLayer == null ? new ConflictCollection() : editLayer.getConflicts());
Note:
See TracChangeset
for help on using the changeset viewer.