diff -r ed23eba1a369 -r 51eae99d81b4 share/hedgewars/Data/Locale/hedgewars_sk.ts
--- a/share/hedgewars/Data/Locale/hedgewars_sk.ts Thu Dec 23 20:32:45 2010 +0100
+++ b/share/hedgewars/Data/Locale/hedgewars_sk.ts Thu Dec 23 20:44:15 2010 +0100
@@ -1089,13 +1089,10 @@
Vietor bude ovplyvňovať takmer všetko.
-<<<<<<< local
-=======
->>>>>>> other
@@ -1111,13 +1108,10 @@
Nová
-<<<<<<< local
-=======
->>>>>>> other
@@ -1567,13 +1561,10 @@
% dĺžka lana
-<<<<<<< local
-=======
->>>>>>> other
@@ -1815,13 +1806,10 @@
nový
-<<<<<<< local
-=======
->>>>>>> other