[libfm/f16: 10/10] Fix merge conflict

[Mamoru Tasaka]

commit 3e7d2fe2010bda8bb4e51649e6796a749fb9bf4d
Merge: 8bc7c6a 3d6f76f
Author: Mamoru Tasaka <tasaka1 at localhost.localdomain>
Date:   Sun Nov 4 02:48:23 2012 +0900

    Fix merge conflict

 .gitignore                     |    1 +
 libfm-0.1.14-dso-linkage.patch |   11 ------
 libfm.spec                     |   69 +++++++++++++++++++++++++++++++--------
 sources                        |    2 +-
 4 files changed, 57 insertions(+), 26 deletions(-)
---