[linux] 01/04: Delete merge failure marker from debian/changelog

[debian-kernel at lists.debian.org]

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

benh pushed a commit to branch jessie-backports
in repository linux.

commit f466fd1b8419e44aeb1fcf91abac3382b00d252b
Author: Ben Hutchings <ben at decadent.org.uk>
Date:   Tue Jan 19 22:56:23 2016 +0000

    Delete merge failure marker from debian/changelog
---
 debian/changelog | 1 -
 1 file changed, 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 6444a0f..adbaa97 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -252,7 +252,6 @@ linux (4.3~rc3-1~exp1) experimental; urgency=medium
     - udeb: Update kernel-versions
 
  -- Ben Hutchings <ben at decadent.org.uk>  Sun, 27 Sep 2015 21:02:54 +0100
->>>>>>> cc0d95e242d204760be419811b888b6a84a05671
 
 linux (4.2.6-3) unstable; urgency=medium
 

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