Drobnosti

Saljack · Nov 22, 2012 · 5b3b346 · 5b3b346
1 parent 3f4857f
commit 5b3b346
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 5 deletions.
diff --git a/res/values/strings.xml b/res/values/strings.xml
@@ -17,14 +17,12 @@
     <string name="sa_normal_mode">Běžný mód</string>
     <string name="sa_blind_mode">Mód naslepo</string>
 
-<<<<<<< HEAD
+
     <!-- FriendsActivity -->
     <string name="fa_add_friend">Přidat přítele</string>
     <string name="fa_choose_friend">Zvolte ze seznamu</string>
-=======
+
     <!-- MapSelectCoordinates -->
     <string name="msc_wantSelect">Chcete vybrat</string>
     <string name="msc_point">Chcete vybrat tento bod:</string>
-
->>>>>>> f6b3b45341842fc2dc70af8e01524b5a324d6913
 </resources>
diff --git a/src/cz/cvut/fel/nur/zavody/maps/UserOverlay.java b/src/cz/cvut/fel/nur/zavody/maps/UserOverlay.java
@@ -55,6 +55,5 @@ public synchronized void onLocationChanged(Location location) {
     @Override
     protected void drawMyLocation(Canvas canvas, MapView mapView, Location lastFix, GeoPoint myLocation, long when) {
         super.drawMyLocation(canvas, mapView, lastFix, myLocation, when);
-
     }
 }