X-Git-Url: https://nos-oignons.net/gitweb/website.git/blobdiff_plain/5bcef4ce8d80941a1d1847be96b3cd931d8ea3b4..fa3a5c972efa85e2e20986b0f6ae4ee2de86be60:/%C3%80_propos.en.po

diff --git "a/\303\200_propos.en.po" "b/\303\200_propos.en.po"
index 2bf7b8d..2b2856f 100644
--- "a/\303\200_propos.en.po"
+++ "b/\303\200_propos.en.po"
@@ -211,7 +211,12 @@ msgstr ""
 #. type: Title =
 #, no-wrap
 msgid "Recherche d'information sur une connexion : ExoneraTor\n"
+<<<<<<< HEAD
+msgstr ""
+"Searching information on a connection : ExoneraTor\n"
+=======
 msgstr "Searching information on a connection : ExoneraTor"
+>>>>>>> 5bcef4ce8d80941a1d1847be96b3cd931d8ea3b4
 
 #. type: Plain text
 #, fuzzy
@@ -244,7 +249,12 @@ msgstr ""
 #. type: Plain text
 #, no-wrap
 msgid "   *https://metrics.torproject.org/exonerator.html?ip=89.234.157.254&timestamp=19-03-10&lang=fr*\n"
+<<<<<<< HEAD
+msgstr ""
+"   *https://metrics.torproject.org/exonerator.html?ip=89.234.157.254&timestamp=2019-03-10*\n"
+=======
 msgstr "   *https://metrics.torproject.org/exonerator.html?ip=89.234.157.254&timestamp=19-03-10*\n"
+>>>>>>> 5bcef4ce8d80941a1d1847be96b3cd931d8ea3b4
 
 #. type: Plain text
 msgid ""