Commit 4fac88f1 authored by boyska's avatar boyska
Browse files

FIX old conflict

parent 7d39275c
......@@ -332,13 +332,6 @@ msgstr ""
"<div class=\"state-image debian expert\">[[!img install/inc/infography/tails-usb-with-persistence.png link=\"no\"]]</div>\n"
"<div class=\"state-image windows linux mac-usb clone\">[[!img install/inc/infography/final-tails-with-persistence.png link=\"no\"]]</div>\n"
"<div class=\"state-image mac-dvd\">[[!img install/inc/infography/tails-usb-with-persistence.png link=\"no\"]]</div>\n"
<<<<<<< HEAD
=======
msgstr ""
"<div class=\"state-image debian expert\">[[!img install/inc/infography/tails-usb-with-persistence.png link=\"no\"]]</div>\n"
"<div class=\"state-image windows linux mac-usb clone\">[[!img install/inc/infography/final-tails-with-persistence.png link=\"no\"]]</div>\n"
"<div class=\"state-image mac-dvd\">[[!img install/inc/infography/tails-usb-with-persistence.png link=\"no\"]]</div>\n"
>>>>>>> def1062ef4b0dd68c9c6f0b1105d1d2d5a6d057e
#. type: Plain text
#, no-wrap
......
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