[mate-settings-daemon] 01/01: debian/patches/series: Fix series file which mixed with former commit.

[Vangelis Mouhtsis]

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

gnugr-guest pushed a commit to branch parrot/3.7
in repository mate-settings-daemon.

commit 553d0003f46d8cca189846977055c7f227a2fe90
Author: Vangelis Mouhtsis <vangelis at gnugr.org>
Date:   Sun Oct 22 17:41:21 2017 +0300

    debian/patches/series: Fix series file which mixed with former commit.
---
 debian/patches/series | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/debian/patches/series b/debian/patches/series
index fc9588e..88a755a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,7 +1,4 @@
 1000_global_menu_support.diff
-<<<<<<< HEAD
-=======
 1001_request_keyboard_event_from_global_keybindings.diff
 1002_fix-randr-applet-dying-on-restart.patch
 
->>>>>>> f0f347a... debian/patches: Add 1002_fix-randr-applet-dying-on-restart.patch. Complete the fix started in 1001_request_keyboard_event_from_global_keybindings.diff.

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