From 6a5be7912824cbdc390f0e806326044420db5dd6 Mon Sep 17 00:00:00 2001 From: axel <as@laquadrature.net> Date: Fri, 25 Jun 2021 19:32:09 +0200 Subject: [PATCH] =?UTF-8?q?Retire=20des=20restes=20de=20git=20merge=20dans?= =?UTF-8?q?=20le=20code=20introduit=20dans=20un=20commit=20pr=C3=A9c=C3=A9?= =?UTF-8?q?dent?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- locales/en_US/LC_MESSAGES/messages.po | 8 -------- 1 file changed, 8 deletions(-) diff --git a/locales/en_US/LC_MESSAGES/messages.po b/locales/en_US/LC_MESSAGES/messages.po index a4cc1c8..86fc401 100644 --- a/locales/en_US/LC_MESSAGES/messages.po +++ b/locales/en_US/LC_MESSAGES/messages.po @@ -830,12 +830,8 @@ msgstr "" "to protect our financial freedom. Our financial regulations document defines " "how:<br />As for companies, the following rules applies:" -<<<<<<< Updated upstream #: app/view/campaign/faq.html:234 #, c-format -======= -#: app/view/campaign/faq.html:235 ->>>>>>> Stashed changes msgid "" "La part du budget annuel de LQdN apportée par des entreprises donnant " "chacune 1 000 euros ou plus une année donnée ne peut dépasser 20% du budget " @@ -877,11 +873,7 @@ msgstr "" msgid "Qui finance La Quadrature du Net ?" msgstr "Who's financing La Quadrature du Net?" -<<<<<<< Updated upstream #: app/view/campaign/faq.html:252 -======= -#: app/view/campaign/faq.html:253 ->>>>>>> Stashed changes msgid "" "La Quadrature du Net est financée à 70 % par des dons individuels : vos " "dons ! Nous acceptons aussi les dons d'entreprise, mais tous les dons " -- GitLab