diff --git a/po/et.po b/po/et.po
index f6c5ca09..ce44b838 100644
--- a/po/et.po
+++ b/po/et.po
@@ -8,11 +8,7 @@ msgstr ""
 "Project-Id-Version: geany 1.22\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2012-12-26 18:25+0200\n"
-<<<<<<< HEAD
-"PO-Revision-Date: 2012-12-27 15:25+0300\n"
-=======
-"PO-Revision-Date: 2012-12-27 13:23+0300\n"
->>>>>>> 4e950a39db1bb046572b0d1c7ba1be922f3969e6
+"PO-Revision-Date: 2012-12-27 13:25+0300\n"
 "Last-Translator: Andreas Ots <andreasots@gmail.com>\n"
 "Language-Team: Estonian\n"
 "Language: et\n"