Index: trunk/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java	(revision 9448)
+++ trunk/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java	(revision 9449)
@@ -540,5 +540,5 @@
 
     class ResolveTpMyVersionAction extends ResolveToAction {
-        public ResolveTpMyVersionAction() {
+        ResolveTpMyVersionAction() {
             super(tr("Resolve to my versions"), tr("Resolves all unresolved conflicts to ''my'' version"),
                     MergeDecisionType.KEEP_MINE);
@@ -547,5 +547,5 @@
 
     class ResolveToTheirVersionAction extends ResolveToAction {
-        public ResolveToTheirVersionAction() {
+        ResolveToTheirVersionAction() {
             super(tr("Resolve to their versions"), tr("Resolves all unresolved conflicts to ''their'' version"),
                     MergeDecisionType.KEEP_THEIR);