source: josm/trunk/src/org/openstreetmap/josm/gui/conflict/pair/MergeDecisionType.java@ 5299

Last change on this file since 5299 was 3083, checked in by bastiK, 14 years ago

added svn:eol-style=native to source files
  • Property svn:eol-style set to native
File size: 179 bytes
Line 
1// License: GPL. For details, see LICENSE file.
2package org.openstreetmap.josm.gui.conflict.pair;
3
4public enum MergeDecisionType {
5 KEEP_MINE,
6 KEEP_THEIR,
7 UNDECIDED,
8}
Note: See TracBrowser for help on using the repository browser.