[python-distutils-extra/f14/master] Updated

[Fabian Affolter]

commit 4bcd855d275c6f93feaeb98418398e95d6cbe94a
Author: Fabian Affolter <fabian at affolter-engineering.ch>
Date:   Thu Mar 17 00:21:19 2011 +0100

    Updated

 sources |    4 ----
 1 files changed, 0 insertions(+), 4 deletions(-)
---
diff --git a/sources b/sources
index 4a5f60c..ecb0fa3 100644
--- a/sources
+++ b/sources
@@ -1,5 +1 @@
-<<<<<<< HEAD
-c085b71263c37af48824f8a353475181  python-distutils-extra-2.22.tar.gz
-=======
 7caded30a45907b5cdb10ac4182846eb  python-distutils-extra-2.26.tar.gz
->>>>>>> master