X-Git-Url: https://nos-oignons.net/gitweb/website.git/blobdiff_plain/4fb3db12f6aa00b250b45ca114c9e6f8fc98e033..567ec864c7f83b0fa322456ab4676bfa94b76361:/Donnez.en.po

diff --git a/Donnez.en.po b/Donnez.en.po
index e69f646..cac2ae3 100644
--- a/Donnez.en.po
+++ b/Donnez.en.po
@@ -133,6 +133,18 @@ msgstr ""
 #| "helloasso.com/associations/nos-oignons/formulaires/1\">Faire un don</a>"
 msgid ""
 "<a style=\"font: 1.2em sans-serif; text-transform: uppercase; max-width: "
+<<<<<<< HEAD
+"181px; text-decoration: none; display: block; background: #5ab330; "
+"text-align: center; padding: .5em .25em; color: #FFF;\" "
+"href="https://www.helloasso.com/associations/nos-oignons/formulaires/1\">"
+"Faire un don</a>"
+msgstr ""
+"<a style=\"font: 1.2em sans-serif; text-transform: uppercase; max-width: "
+"181px; text-decoration: none; display: block; background: #5ab330; "
+"text-align: center; padding: .5em .25em; color: #FFF;\" "
+"href="https://www.helloasso.com/associations/nos-oignons/formulaires/1/en\">"
+"Donate</a>"
+=======
 "181px; text-decoration: none; display: block; background: #5ab330; text-"
 "align: center; padding: .5em .25em; color: #FFF;\" href=\"https://www."
 "helloasso.com/associations/nos-oignons/formulaires/1\"> Faire un don</a>"
@@ -141,6 +153,7 @@ msgstr ""
 "181px; text-decoration: none; display: block;background: #5ab330; text-"
 "align: center;padding: .5em .25em; color: #FFF;\"href=\"https://www."
 "helloasso.com/associations/nos-oignons/formulaires/1/en\">Donate</a>"
+>>>>>>> 4fb3db12f6aa00b250b45ca114c9e6f8fc98e033
 
 #. type: Content of: <div><h3>
 msgid "Par PayPal"