[packages/lyricue: 3/3] Resolve conflict

[caleb]

commit 626a789183d8d5c34337414ea56e1755bd5e3cf6
Merge: 6148683 37e0e0a
Author: Caleb Maclennan <caleb at pld-linux.org>
Date:   Thu Mar 21 14:08:55 2013 +0200

    Resolve conflict

 lyricue.spec | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
---
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/lyricue.git/commitdiff/626a789183d8d5c34337414ea56e1755bd5e3cf6