remove remnant of merge conflict

pull/2378/head
thyttan 2022-12-08 23:12:30 +01:00
parent 80ea9d910c
commit 5a519e372d
1 changed files with 0 additions and 1 deletions

View File

@ -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)