Index: trunk/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java	(revision 1668)
+++ trunk/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java	(revision 1669)
@@ -19,14 +19,14 @@
 
 /**
- * This is the model for resolving conflicts in the properties of thw
+ * This is the model for resolving conflicts in the properties of the
  * {@see OsmPrimitive}s. In particular, it represents conflicts in the coordiates of {@see Node}s and
  * the deleted state of {@see OsmPrimitive}s.
- * 
+ *
  * This model is an {@see Observable}. It notifies registered {@see Observer}s whenever the
  * internal state changes.
- * 
+ *
  * This model also emits property changes for {@see #RESOLVED_COMPLETELY_PROP}. Property change
  * listeners may register themselves using {@see #addPropertyChangeListener(PropertyChangeListener)}.
- * 
+ *
  * @see Node#getCoor()
  * @see OsmPrimitive#deleted
@@ -71,5 +71,5 @@
      * replies true if there is a coordinate conflict and if this conflict is
      * resolved
-     * 
+     *
      * @return true if there is a coordinate conflict and if this conflict is
      * resolved; false, otherwise
@@ -82,5 +82,5 @@
      * replies true if there is a  conflict in the deleted state and if this conflict is
      * resolved
-     * 
+     *
      * @return true if there is a conflict in the deleted state and if this conflict is
      * resolved; false, otherwise
@@ -92,5 +92,5 @@
     /**
      * replies true if the current decision for the coordinate conflict is <code>decision</code>
-     * 
+     *
      * @return true if the current decision for the coordinate conflict is <code>decision</code>;
      *  false, otherwise
@@ -102,5 +102,5 @@
     /**
      * replies true if the current decision for the deleted state conflict is <code>decision</code>
-     * 
+     *
      * @return true if the current decision for the deleted state conflict is <code>decision</code>;
      *  false, otherwise
@@ -112,5 +112,5 @@
     /**
      * populates the model with the differences between my and their version
-     * 
+     *
      * @param my my version of the primitive
      * @param their their version of the primitive
@@ -139,5 +139,5 @@
      * replies the coordinates of my {@see OsmPrimitive}. null, if my primitive hasn't
      * coordinates (i.e. because it is a {@see Way}).
-     * 
+     *
      * @return the coordinates of my {@see OsmPrimitive}. null, if my primitive hasn't
      *  coordinates (i.e. because it is a {@see Way}).
@@ -150,5 +150,5 @@
      * replies the coordinates of their {@see OsmPrimitive}. null, if their primitive hasn't
      * coordinates (i.e. because it is a {@see Way}).
-     * 
+     *
      * @return the coordinates of my {@see OsmPrimitive}. null, if my primitive hasn't
      * coordinates (i.e. because it is a {@see Way}).
@@ -161,5 +161,5 @@
      * replies the coordinates of the merged {@see OsmPrimitive}. null, if the current primitives
      * have no coordinates or if the conflict is yet {@see MergeDecisionType#UNDECIDED}
-     * 
+     *
      * @return the coordinates of the merged {@see OsmPrimitive}. null, if the current primitives
      * have no coordinates or if the conflict is yet {@see MergeDecisionType#UNDECIDED}
@@ -177,5 +177,5 @@
     /**
      * decides a conflict between my and their coordinates
-     * 
+     *
      * @param decision the decision
      */
@@ -219,5 +219,5 @@
      * replies true if my and their primitive have a conflict between
      * their coordinate values
-     * 
+     *
      * @return true if my and their primitive have a conflict between
      * their coordinate values; false otherwise
@@ -233,5 +233,5 @@
      * replies true if my and their primitive have a conflict between
      * their deleted states
-     * 
+     *
      * @return true if my and their primitive have a conflict between
      * their deleted states
@@ -243,5 +243,5 @@
     /**
      * replies true if all conflict in this model are resolved
-     * 
+     *
      * @return true if all conflict in this model are resolved; false otherwise
      */
@@ -259,5 +259,5 @@
     /**
      * builds the command(s) to apply the conflict resolutions to my primitive
-     * 
+     *
      * @param my  my primitive
      * @param their their primitive