[SCM] engrampa Debian package branch, master, updated. debian/1.8.0+dfsg1-3-3-g519f584

[Vangelis Mouhtsis]

Gitweb-URL: http://git.debian.org/?p=pkg-mate/engrampa.git;a=commitdiff;h=519f584

The following commit has been merged in the master branch:
commit 519f5849e1021ae96b2aa05bbd37136ea377944f
Merge: f4909b640d71669319e161a94419980de3d02c11 fb9cfe1890afe4642d7c4c968984b4bc70debfb0
Author: Vangelis Mouhtsis <vangelis at gnugr.org>
Date:   Thu May 15 12:56:08 2014 +0300

    Merge branch 'master' of ssh://git.debian.org/git/pkg-mate/engrampa
    
    Conflicts:
    	debian/control

 debian/control | 4 ++++
 1 file changed, 4 insertions(+)

diff --cc debian/control
index f0d820f,29ada76..bc04c1c
--- a/debian/control
+++ b/debian/control
@@@ -27,7 -27,7 +27,11 @@@ Depends: ${shlibs:Depends}
           bzip2 (>= 1.0.1),
           gzip (>= 1.3.2),
           p7zip-full,
++<<<<<<< HEAD
 +         engrampa-common (= ${source:Version}),
++=======
+          engrampa-common (= ${source:Version})
++>>>>>>> fb9cfe1890afe4642d7c4c968984b4bc70debfb0
           caja-common
  Recommends: rpm2cpio,
              mate-icon-theme,

-- 
engrampa Debian package