[freeplane] 03/03: resolve conflict

[Felix Natter]

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

fnatter-guest pushed a commit to branch master
in repository freeplane.

commit c2e8491ca6446efbef1cd5cd85b32fd6cf6fc4d7
Merge: f8c6863 2df73f8
Author: Felix Natter <fnatter at gmx.net>
Date:   Sun Nov 20 14:32:42 2016 +0100

    resolve conflict

 debian/patches/50_jgoodies-1.9.patch | 5 -----
 1 file changed, 5 deletions(-)

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