[comix/f17: 3/5] fix conflict

[Mamoru Tasaka]

commit d4cb25293763be9aa5877c6eef199378c3adeb2e
Merge: 0bd0875 4cea6e6
Author: TASAKA Mamoru <mtasaka at localhost.localdomain>
Date:   Tue Dec 4 13:34:53 2012 +0900

    fix conflict

 comix.spec |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)
---