Changeset 86 in josm for src/org/openstreetmap/josm/data/projection

Timestamp:

2006-04-21T14:31:51+02:00 (18 years ago)

Author:

imi

Message:

• added conflicts and resolve conflict dialog

This is one of those "changed everything" checkpoint.

Location:

src/org/openstreetmap/josm/data/projection

Files:

• Epsg4326.java (modified) (1 diff)
• Mercator.java (modified) (1 diff)

src/org/openstreetmap/josm/data/projection/Epsg4326.java

@@ -19 +19 @@
         }
 
-        @Override
-        public String toString() {
+        @Override public String toString() {
                 return "EPSG:4326";
         }

src/org/openstreetmap/josm/data/projection/Mercator.java

@@ -27 +27 @@
         }
 
-        @Override
-        public String toString() {
+        @Override public String toString() {
                 return "Mercator";
         }