[perl-Log-Dispatchouli/f21: 4/4] Resolve merge conflicts

[Petr Šabata]

commit 7a8ebb306ad6c98eb00c8a3585b7293f6cfd3304
Merge: b3eb23a 5ab9377
Author: Petr Šabata <contyk at redhat.com>
Date:   Fri Dec 5 15:16:01 2014 +0100

    Resolve merge conflicts
    
    Signed-off-by: Petr Šabata <contyk at redhat.com>

 .gitignore                 |    1 +
 perl-Log-Dispatchouli.spec |   33 ++++++++++++++++++++-------------
 sources                    |    2 +-
 3 files changed, 22 insertions(+), 14 deletions(-)
---