[sugar-pippy/f14/master: 3/3] fix merge

[Peter Robinson]

commit c5a95edd2c869d5b0fdc887b37c73557150eb6a4
Merge: c7b3a5f 09f295d
Author: Peter Robinson <pbrobinson at gmail.com>
Date:   Tue Nov 9 22:51:56 2010 +0000

    fix merge

 .gitignore       |    3 +--
 sources          |    2 +-
 sugar-pippy.spec |    7 ++++---
 3 files changed, 6 insertions(+), 6 deletions(-)
---
diff --cc .gitignore
index cbd8f7b,6001f4c..593df58
--- a/.gitignore
+++ b/.gitignore
@@@ -1,2 -1,3 +1,1 @@@
--pippy-36.xo
--Pippy-37.tar.bz2
 -/Pippy-38.tar.bz2
++Pippy-38.tar.bz2