Fix/edit email templates

energy_communities/i18n/eu_ES.po

@@ -2097,29 +2097,17 @@ msgstr "[Somcomunitats.coop] Erkidegoko kide izateko eskaera"
 #. module: energy_communities
 #: model:mail.template,subject:energy_communities.email_templ_lead_request_contact_confirm_id
 msgid "[Somcomunitats.coop] Community Contact Request"
-<<<<<<< HEAD
-msgstr "[Somcomunitats.coop] Komunitatearekin harremanetan jartzeko eskaera"
-=======
 msgstr "[Somcomunitats.coop] Jarri harremanetan Energia Komunitatearekin"
->>>>>>> bf01f4d (Update translations)
 
 #. module: energy_communities
 #: model:mail.template,subject:energy_communities.email_templ_lead_request_ce_news_confirm_id
 msgid "[Somcomunitats.coop] Community Newsletter Subscription Request"
-<<<<<<< HEAD
-msgstr "[Somcomunitats.coop] Komunitatearen Buletinaren Harpidetza Eskaera"
-=======
 msgstr "[Somcomunitats.coop] Buletinerako harpidetza Energia Komunitatearekin"
->>>>>>> bf01f4d (Update translations)
 
 #. module: energy_communities
 #: model:mail.template,subject:energy_communities.email_templ_lead_request_advise_future_ce_confirm_id
 msgid "[Somcomunitats.coop] Interested in Communities in your area"
-<<<<<<< HEAD
-msgstr "[Somcomunitats.coop] Zure inguruko komunitateetan interesatuta zaude"
-=======
 msgstr "[Somcomunitats.coop] Zure inguruko komunitateetan interesatzen zaizu"
->>>>>>> bf01f4d (Update translations)
 
 #. module: energy_communities
 #: model:mail.template,subject:energy_communities.email_templ_lead_ce_creation_receipt_confirm_id