[pkg-bacula-commits] [SCM] Bacula, a network backup, recovery and verification program branch, squeeze-backports, updated. debian/5.2.6+dfsg-7-18-g32d7ccc

[Bart Swedrowski]

The following commit has been merged in the squeeze-backports branch:
commit 8c4008a1847037e988fa9263c3ecdb4b23c39e3c
Author: Bart Swedrowski <bart at timedout.org>
Date:   Tue Jan 22 16:00:25 2013 +0000

    Fix outstanding merge conflict

diff --git a/debian/control b/debian/control
index b29e4df..3d0dd05 100644
--- a/debian/control
+++ b/debian/control
@@ -274,13 +274,8 @@ Description: network backup service - client metapackage
 
 Package: bacula-fd
 Architecture: any
-<<<<<<< HEAD
-Depends: bacula-common (= ${binary:Version}), lsb-base, ucf,
- ${shlibs:Depends}, ${misc:Depends}
-=======
 Depends: bacula-common (= ${binary:Version}), lsb-base, ucf, ${shlibs:Depends},
  ${misc:Depends}
->>>>>>> debian/5.2.6+dfsg-7
 Suggests: bacula-traymonitor
 Description: network backup service - file daemon
  Bacula is a set of programs to manage backup, recovery, and verification of

-- 
Bacula, a network backup, recovery and verification program