[obs-studio/f25: 3/3] fix merge

[Leigh Scott]

commit b181a340aa8ccb5d270a144afe18282cf18de0aa
Merge: e93262e 86e52f5
Author: leigh123linux <leigh123linux at googlemail.com>
Date:   Sat Aug 13 19:40:38 2016 +0100

    fix merge

 obs-studio.spec | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)
---