[gnome-builder/gnome-builder-3-18] po: fix failed merge

[Christian Hergert <chergert src gnome org>]

commit 01630207fedf71701fd130436c50ca1d952cc1b7
Author: Christian Hergert <chergert redhat com>
Date:   Tue Oct 13 00:22:14 2015 -0700

    po: fix failed merge

 po/sr.po |   10 +---------
 1 files changed, 1 insertions(+), 9 deletions(-)
---
diff --git a/po/sr.po b/po/sr.po
index d06d364..3cdf506 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -11,7 +11,7 @@ msgstr ""
 "Project-Id-Version: gnome-builder master\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-";
 "builder&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2015-09-22 09:13+0000\n"
+"POT-Creation-Date: 2015-09-21 12:13+0000\n"
 "PO-Revision-Date: 2015-09-22 11:11+0200\n"
 "Last-Translator: Милош Поповић <gpopac gmail com>\n"
 "Language-Team: српски <gnome-sr googlegroups org>\n"
@@ -293,12 +293,8 @@ msgid "8"
 msgstr "8"
 
 #: ../data/ui/gb-editor-view.ui.h:2 ../data/ui/gb-greeter-window.ui.h:4
-<<<<<<< ab4da0e386527caef497fb9da108e199235b8cd5
-#: ../data/ui/gb-new-project-dialog.ui.h:2 ../data/ui/gb-projects-dialog.ui.h:3
-=======
 #: ../data/ui/gb-new-project-dialog.ui.h:2
 #: ../data/ui/gb-projects-dialog.ui.h:3
->>>>>>> Updated Serbian translation
 msgid "_Cancel"
 msgstr "_Откажи"
 
@@ -668,12 +664,8 @@ msgstr "Поставке"
 msgid "Search Preferences…"
 msgstr "Поставке претраге..."
 
-<<<<<<< ab4da0e386527caef497fb9da108e199235b8cd5
-#: ../data/ui/gb-projects-dialog.ui.h:1 ../src/dialogs/gb-projects-dialog.c:255
-=======
 #: ../data/ui/gb-projects-dialog.ui.h:1
 #: ../src/dialogs/gb-projects-dialog.c:255
->>>>>>> Updated Serbian translation
 msgid "Select Project"
 msgstr "Изабери пројекат"