Commit 9b0cceb2 authored by intrigeri's avatar intrigeri
Browse files

Fix buggy merge conflict resolution.

parent a4ee61f4
......@@ -7,11 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: \n"
"POT-Creation-Date: 2016-02-13 03:03+0100\n"
<<<<<<< HEAD
"PO-Revision-Date: 2016-03-03 00:51+0100\n"
=======
"PO-Revision-Date: 2016-04-05 23:26+0100\n"
>>>>>>> doc_first_step_ABIM
"Last-Translator: \n"
"Language-Team: \n"
"Language: it_IT\n"
......
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