[php-phpunit-File-Iterator/f13/master: 7/7] fix merge

[Christof Damian]

commit ae6e4bb3bef13854a5b09f3ee1fd7a5254f57916
Author: Christof Damian <christof at damian.net>
Date:   Fri Sep 17 18:48:46 2010 +0200

    fix merge

 sources |    4 ----
 1 files changed, 0 insertions(+), 4 deletions(-)
---
diff --git a/sources b/sources
index 8b0bbc6..9be5e06 100644
--- a/sources
+++ b/sources
@@ -1,5 +1 @@
-<<<<<<< HEAD
-3a0594013f62747794a54b468902f01e  File_Iterator-1.2.2.tgz
-=======
 8658ddc33b4996aba71234c49efcc927  File_Iterator-1.2.3.tgz
->>>>>>> master