[flowblade/f24: 8/8] fix merge

[Leigh Scott]

commit ec220a402628374d8735d0e1d723ba7f590b890c
Merge: a757db6 820bd74
Author: leigh123linux <leigh123linux at googlemail.com>
Date:   Wed Aug 17 12:00:03 2016 +0100

    fix merge

 flowblade.spec | 54 ++++++++++++++++++++++++++++++------------------------
 1 file changed, 30 insertions(+), 24 deletions(-)
---