[hurd] 01/01: fix missing merge

[Samuel Thibault]

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

sthibault pushed a commit to branch master
in repository hurd.

commit f6e79d4b5dd15e5a910d9e15d4d94121e4034489
Author: Samuel Thibault <address@hidden>
Date:   Tue Jan 14 02:04:43 2014 +0000

    fix missing merge
---
 debian/patches/series | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/debian/patches/series b/debian/patches/series
index e8cc0d3..5ae5aa8 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -42,8 +42,5 @@ exec_filename_fix.patch
 mount-loop.patch
 proc_set_init_task.patch
 newRPC.patch
-<<<<<<< HEAD
 libports_revert_stacksize.patch
-=======
 xkb-compat.patch
->>>>>>> 5473b7b628a8b0764d1c33d4a28d6d01e4b6cc0c

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