[pkg-bacula-commits] [bacula] 01/01: Remove forgotten git conflict marker.

[Sven Hartge]

This is an automated email from the git hooks/post-receive script.

hartge-guest pushed a commit to branch hardcode-users
in repository bacula.

commit 437a2b2ba56607c395039af7f11ec9d88718ee43
Author: Sven Hartge <sven at svenhartge.de>
Date:   Mon Sep 19 19:36:35 2016 +0200

    Remove forgotten git conflict marker.
---
 debian/changelog | 1 -
 1 file changed, 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 94f7938..fedb2d5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -18,7 +18,6 @@ bacula (7.4.3+dfsg-7) unstable; urgency=high
   * Move make_catalog_backup.pl to package bacula-director
 
  -- Carsten Leonhardt <leo at debian.org>  Mon, 19 Sep 2016 17:55:43 +0200
->>>>>>> master
 
 bacula (7.4.3+dfsg-6) unstable; urgency=low
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-bacula/bacula.git