[sugar-turtleart/f14/master: 4/4] fix merge issues

[Peter Robinson]

commit 91ddecd4ca767a2755e38bac8cfdef99dcd8a222
Merge: 252c4ff 75c070e
Author: Peter Robinson <pbrobinson at gmail.com>
Date:   Wed Sep 22 12:09:59 2010 +0100

    fix merge issues

 .gitignore           |    4 +---
 sources              |    2 +-
 sugar-turtleart.spec |    6 ++++--
 3 files changed, 6 insertions(+), 6 deletions(-)
---
diff --cc .gitignore
index 9cb5033,aea3b8f..f3e756b
--- a/.gitignore
+++ b/.gitignore
@@@ -1,3 -1,4 +1,1 @@@
--TurtleArt-89.tar.bz2
--TurtleArt-92.tar.bz2
--TurtleArt-94.tar.bz2
 -/TurtleArt-98.tar.bz2
++TurtleArt-98.tar.bz2