[sugar-flipsticks/f17: 3/3] fix merge

[Peter Robinson]

commit e695c14d5031a6c49b5812c1dbabded074ed5b6d
Merge: a243422 680a0ae
Author: Peter Robinson <pbrobinson at gmail.com>
Date:   Thu Jun 7 11:23:35 2012 +0100

    fix merge

 .gitignore            |    3 +--
 sources               |    2 +-
 sugar-flipsticks.spec |    5 ++++-
 3 files changed, 6 insertions(+), 4 deletions(-)
---