chore: rebase dev fix

cal-itp · Jul 18, 2023 · 9b4fd2c · 9b4fd2c
1 parent 934e683
commit 9b4fd2c
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 6 deletions.
diff --git a/benefits/locale/en/LC_MESSAGES/django.po b/benefits/locale/en/LC_MESSAGES/django.po
@@ -414,11 +414,10 @@ msgstr ""
 "If you do not have an account with any of these services, you will need to "
 "create one. We recommend using Login.gov."
 
-<<<<<<< HEAD
 msgctxt "image alt text"
 msgid "core.icons.idcardcheck"
 msgstr "Identification card icon with checkmark"
-=======
+
 msgid "eligibility.pages.start.modal.title"
 msgstr "Learn more about contactless cards"
 
@@ -446,7 +445,6 @@ msgstr ""
 
 msgid "eligibility.pages.start.sub_headline"
 msgstr "You will need a few items to connect your benefit:"
->>>>>>> cf5f86c6 (feat(eligibility-start): first pass at contactless modal)
 
 msgid "eligibility.pages.index.senior.help.headline"
 msgstr "Learn more about"

diff --git a/benefits/locale/es/LC_MESSAGES/django.po b/benefits/locale/es/LC_MESSAGES/django.po
@@ -426,11 +426,10 @@ msgstr ""
 "TODO: If you do not have an account with any of these services, you will "
 "need to create one. We recommend using Login.gov."
 
-<<<<<<< HEAD
 msgctxt "image alt text"
 msgid "core.icons.idcardcheck"
 msgstr "Icono de tarjeta de identificación con marca de verificación"
-=======
+
 msgid "eligibility.pages.start.modal.title"
 msgstr "TODO: Learn more about contactless cards"
 
@@ -458,7 +457,6 @@ msgstr ""
 
 msgid "eligibility.pages.start.sub_headline"
 msgstr "Necesitará algunos artículos para conectar su beneficio:"
->>>>>>> cf5f86c6 (feat(eligibility-start): first pass at contactless modal)
 
 msgid "eligibility.pages.index.senior.help.headline"
 msgstr "TODO: Learn more about"