[eclipse-pydev] 01/01: Revert "Merge branch 'pristine-tar' of git+ssh://git.debian.org/git/pkg-java/eclipse-pydev into pristine-tar"

[Markus Koschany]

This is an automated email from the git hooks/post-receive script.

apo-guest pushed a commit to branch pristine-tar
in repository eclipse-pydev.

commit 4856d7e3beec5b623200f6ac107d19610018917b
Author: Markus Koschany <apo at gambaru.de>
Date:   Sun Mar 8 13:01:35 2015 +0100

    Revert "Merge branch 'pristine-tar' of git+ssh://git.debian.org/git/pkg-java/eclipse-pydev into pristine-tar"
    
    This reverts commit 011d146a3b7cb6abcf3b15ddab22e058fafaaf10, reversing
    changes made to 46ff37228c21bdd4dc0db6aab1a808dd2d4ff8fc.
---
 eclipse-pydev_3.9.2.orig.tar.xz.id | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/eclipse-pydev_3.9.2.orig.tar.xz.id b/eclipse-pydev_3.9.2.orig.tar.xz.id
index 3a81358..3988d48 100644
--- a/eclipse-pydev_3.9.2.orig.tar.xz.id
+++ b/eclipse-pydev_3.9.2.orig.tar.xz.id
@@ -1,5 +1 @@
-<<<<<<< HEAD
 d5e5a1251b5d015f1426842929fa7028a2d66e76
-=======
-43cb532b1a02a7d34c4d844ced24b8da48daabe2
->>>>>>> bcc0d167f4bda26bdaafad355a4cb2eb0191e8c5

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/eclipse-pydev.git