[python-distutils-extra/f15: 2/3] * Fri Jun 16 2012 Fabian Affolter <mail at fabian-affolter.ch> - 2.33-1 - Updated to new upstream versi

[Fabian Affolter]

commit 5588878c88491a4d227116579674cbcab4d00a02
Author: Fabian Affolter <mail at fabian-affolter.ch>
Date:   Sat Jun 16 00:49:54 2012 +0200

    * Fri Jun 16 2012 Fabian Affolter <mail at fabian-affolter.ch> - 2.33-1
    - Updated to new upstream version 2.33

 .gitignore |    1 +
 sources    |    6 +-----
 2 files changed, 2 insertions(+), 5 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 1a57c17..6b24aaf 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,3 +9,4 @@ dist-python-distutils-extra-2.19.tar.gz
 /python-distutils-extra-2.31.tar.gz
 /python-distutils-extra-2.32.tar.gz
 >>>>>>> master
+/python-distutils-extra-2.33.tar.gz
diff --git a/sources b/sources
index 8df0de3..fc960c4 100644
--- a/sources
+++ b/sources
@@ -1,5 +1 @@
-<<<<<<< HEAD
-6f4bd56233161fe8ce29a1b344f99da6  python-distutils-extra-2.28.tar.gz
-=======
-034b6594d10084bb49d99c1511b30187  python-distutils-extra-2.32.tar.gz
->>>>>>> master
+e4c2971bbf294af453d7144f2cb0aa70  python-distutils-extra-2.33.tar.gz