[gnome-boxes/gnome-3-12] Resolve merge conflict in Greek translation file

[Zeeshan Ali Khattak <zeeshanak src gnome org>]

commit e15dbf37411de7c89fbde17da3ce2123e40b7504
Author: Zeeshan Ali (Khattak) <zeeshanak gnome org>
Date:   Wed Mar 26 14:11:28 2014 +0000

    Resolve merge conflict in Greek translation file
    
    This should have been in 8f202664dddb50f7ba7abacc718ca5db9d060ce4.

 po/el.po |    9 ---------
 1 files changed, 0 insertions(+), 9 deletions(-)
---
diff --git a/po/el.po b/po/el.po
index 8937913..e5a7925 100644
--- a/po/el.po
+++ b/po/el.po
@@ -10,13 +10,8 @@ msgstr ""
 "Project-Id-Version: gnome-boxes master\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-";
 "boxes&keywords=I18N+L10N&component=general\n"
-<<<<<<< HEAD
-"POT-Creation-Date: 2014-04-18 06:32+0000\n"
-"PO-Revision-Date: 2014-04-18 19:49+0200\n"
-=======
 "POT-Creation-Date: 2014-04-23 09:37+0000\n"
 "PO-Revision-Date: 2014-04-23 18:08+0200\n"
->>>>>>> 5f0e723... Updated Greek help translation
 "Last-Translator: Tom Tryfonidis <tomtryf gmail com>\n"
 "Language-Team: www.gnome.gr\n"
 "Language: el\n"
@@ -410,10 +405,6 @@ msgid "New and Recent"
 msgstr "Νέα και πρόσφατα"
 
 #: ../src/display-page.vala:88
-<<<<<<< HEAD
-#| msgid "(press [left] Ctrl+Alt keys to ungrab)"
-=======
->>>>>>> 5f0e723... Updated Greek help translation
 msgid "(press Ctrl+Alt keys to ungrab)"
 msgstr "(πατήστε Ctrl+Alt για να το ξεπιάσετε)"