[monitoring-plugins] Remove merge conflict artefact from previous merge

[Lorenz Kästle]

 Module: monitoring-plugins
 Branch: dev/check_ssh-patches
 Commit: ed0779102d8d86559d7db257da6cedfa8e10fca0
 Author: Lorenz Kästle <12514511+RincewindsHat at users.noreply.github.com>
   Date: Sun Oct 15 22:11:39 2023 +0200
    URL: https://www.monitoring-plugins.org/repositories/monitoring-plugins/commit/?id=ed07791

Remove merge conflict artefact from previous merge

---

 po/fr.po | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/po/fr.po b/po/fr.po
index ef3cddc..00da8e6 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -5364,17 +5364,15 @@ msgstr ""
 msgid "The -v switch can be specified several times for increased verbosity."
 msgstr ""
 
-<<<<<<< HEAD
 #, c-format
 #~ msgid "Server answer: %s"
 #~ msgstr "Réponse du serveur: %s"
-=======
+
 #, fuzzy
 #~ msgid "Check only filesystems of indicated type (may be repeated)"
 #~ msgstr ""
 #~ "Ignorer tout les systèmes de fichiers qui correspondent au type indiqué "
 #~ "(peut être utilisé plusieurs fois)"
->>>>>>> master
 
 #~ msgid "Path or partition (may be repeated)"
 #~ msgstr "Répertoire ou partition (peut être utilisé plusieurs fois)"