commit 7a8ebb306ad6c98eb00c8a3585b7293f6cfd3304
Merge: b3eb23a 5ab9377
Author: Petr Šabata <contyk@xxxxxxxxxx>
Date: Fri Dec 5 15:16:01 2014 +0100
Resolve merge conflicts
Signed-off-by: Petr Šabata <contyk@xxxxxxxxxx>
.gitignore | 1 +
perl-Log-Dispatchouli.spec | 33 ++++++++++++++++++++-------------
sources | 2 +-
3 files changed, 22 insertions(+), 14 deletions(-)
---
--
Fedora Extras Perl SIG
http://www.fedoraproject.org/wiki/Extras/SIGs/Perl
perl-devel mailing list
perl-devel@xxxxxxxxxxxxxxxxxxxxxxx
https://admin.fedoraproject.org/mailman/listinfo/perl-devel
