[farstream02/f18: 3/4] Fix merge errors... ugh

[Brian Pepple]

commit ccdb768defb17064dcab12cdab53581692de7269
Merge: fe365a7 257ac55
Author: Brian Pepple <bpepple at fedoraproject.org>
Date:   Wed Nov 14 09:21:20 2012 -0500

    Fix merge errors... ugh

 .gitignore       |    1 +
 farstream02.spec |    9 ++++++---
 sources          |    2 +-
 3 files changed, 8 insertions(+), 4 deletions(-)
---