From 5a519e372da882aeb1858af651d6602df02e8b2f Mon Sep 17 00:00:00 2001
From: thyttan <6uuxstm66@mozmail.com⁩>
Date: Thu, 8 Dec 2022 23:12:30 +0100
Subject: [PATCH] remove remnant of merge conflict

---
 apps/weather/ChangeLog | 1 -
 1 file changed, 1 deletion(-)

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)