[clipgrab/f23: 4/4] fix merge

[Leigh Scott]

commit 24234720987a364dab0dc976fb44074111a4b8b2
Merge: 0dc5504 cf37483
Author: leigh123linux <leigh123linux at googlemail.com>
Date:   Wed Aug 17 09:39:01 2016 +0100

    fix merge

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