diff --git a/apps/weather/ChangeLog b/apps/weather/ChangeLog
index 359cb8635..f1d001c81 100644
--- a/apps/weather/ChangeLog
+++ b/apps/weather/ChangeLog
@@ -19,4 +19,3 @@
 0.20: Added weather condition with temperature to clkinfo.
 0.21: Updated clkinfo icon.
 0.22: Automatic translation of strings, some left untranslated.
->>>>>>> b37fcacd1 (weather - autotranslate strings)