[geany/geany] fb081f: update id.po

[bervianto]

Branch:      refs/heads/master
Author:      bervianto <13514047 at std.stei.itb.ac.id>
Committer:   bervianto <13514047 at std.stei.itb.ac.id>
Date:        Sun, 30 Oct 2016 16:08:14 UTC
Commit:      fb081f77320cb4a375e3399d8afb10e932f2bd11
             https://github.com/geany/geany/commit/fb081f77320cb4a375e3399d8afb10e932f2bd11

Log Message:
-----------
update id.po


Modified Paths:
--------------
    po/id.po

Modified: po/id.po
6 lines changed, 1 insertions(+), 5 deletions(-)
===================================================================
@@ -3,11 +3,7 @@
 # This file is distributed under the same license as the geany package.
 # Fajar Wahyu <fajarwahyuabdillah at gmail.com>, 2012.
 # Samsul Ma'arif <mail at samsul.web.id>, 2014, 2015.
-<<<<<<< HEAD
-# Bervianto Leo Pratama <bervianto.leo at gmail.com>, 2015.
-=======
-# Bervianto Leo Pratama <bervianto.leo at gmail.com>, 2016/
->>>>>>> fetch-1
+# Bervianto Leo Pratama <bervianto.leo at gmail.com>, 2016.
 #
 msgid ""
 msgstr ""



--------------
This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).