[clipgrab/f24: 4/4] fix merge

[Leigh Scott]

commit 4386e5e6f242a4b7193ce05ea537ac053103a850
Merge: 6ba4033 cf37483
Author: leigh123linux <leigh123linux at googlemail.com>
Date:   Wed Aug 17 09:37:23 2016 +0100

    fix merge

 clipgrab.spec | 9 ++++++---
 clog          | 2 ++
 2 files changed, 8 insertions(+), 3 deletions(-)
---