[flowblade/f23: 8/8] fix merge

[Leigh Scott]

commit 07241dd1feea630a3de0e527d713fa63297c44dd
Merge: 3ae3cec 820bd74
Author: leigh123linux <leigh123linux at googlemail.com>
Date:   Wed Aug 17 12:01:44 2016 +0100

    fix merge

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