Commit 2f12d800 authored by Tails developers's avatar Tails developers
Browse files

Deal with forgotten merge conflict.

parent 8ad6386e
...@@ -87,13 +87,8 @@ msgstr "" ...@@ -87,13 +87,8 @@ msgstr ""
#. type: Title = #. type: Title =
#, no-wrap #, no-wrap
<<<<<<< HEAD
msgid "Change persistent volume passphrase\n"
msgstr "Changer la phrase de passe du volume persistant\n"
=======
msgid "Change the passphrase of the persistent volume\n" msgid "Change the passphrase of the persistent volume\n"
msgstr "" msgstr ""
>>>>>>> origin/master
#. type: Bullet: ' 1. ' #. type: Bullet: ' 1. '
msgid "" msgid ""
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment