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

[Peter Robinson]

commit db015fd86cc855fb8982a7538e3e6955afcd700b
Merge: d6d7533 2e77e51
Author: Peter Robinson <pbrobinson at gmail.com>
Date:   Thu Apr 19 18:10:55 2012 +0100

    fix merge

 sources |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)
---
diff --cc sources
index 826ea09,6d8f9fc..d60bb99
--- a/sources
+++ b/sources
@@@ -1,1 -1,2 +1,6 @@@
++<<<<<<< HEAD
 +202f22d34668aa28008a033d9eab97b3  sugar-artwork-0.95.5.tar.bz2
++=======
+ a9851e533b3c05c0594e54e6789fe5f6  sugar-artwork-0.95.3.tar.bz2
+ f4a4e23d314d0f4f64520fbfa43474b5  sugar-artwork-0.95.4.tar.bz2
++>>>>>>> 2e77e516c1368331da58699bc5146e1b427466b0