[xscreensaver/f18: 5/5] fix conflict

[Mamoru Tasaka]

commit 6384b603924a4c90b49d3a92c32b283074a69510
Merge: 673dcb3 b3accd7
Author: TASAKA Mamoru <mtasaka at localhost.localdomain>
Date:   Wed Oct 17 10:35:15 2012 +0900

    fix conflict

 xscreensaver.spec |   17 +++++++++++------
 1 files changed, 11 insertions(+), 6 deletions(-)
---