From 438e82225ace9c121a961d09f6a0bca394478c07 Mon Sep 17 00:00:00 2001 From: Christopher Blum Date: Fri, 12 Apr 2024 20:36:06 +0200 Subject: [PATCH] [de] resolve merge conflict --- .../resources/org/languagetool/resource/de/hunspell/ignore.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/languagetool-language-modules/de/src/main/resources/org/languagetool/resource/de/hunspell/ignore.txt b/languagetool-language-modules/de/src/main/resources/org/languagetool/resource/de/hunspell/ignore.txt index 8942219850b8..618f9f1e85a1 100644 --- a/languagetool-language-modules/de/src/main/resources/org/languagetool/resource/de/hunspell/ignore.txt +++ b/languagetool-language-modules/de/src/main/resources/org/languagetool/resource/de/hunspell/ignore.txt @@ -243363,7 +243363,6 @@ Akashi/S Lisog/S LiSoG Migori/S -Paleo #alternative spelling Cityhopper/S #name Gboard #name RFP