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 011d146a3b7cb6abcf3b15ddab22e058fafaaf10 Merge: 46ff372 bcc0d16 Author: Markus Koschany <[email protected]> Date: Sat Mar 7 07:23:34 2015 +0100 Merge branch 'pristine-tar' of git+ssh://git.debian.org/git/pkg-java/eclipse-pydev into pristine-tar Conflicts: eclipse-pydev_3.9.2.orig.tar.xz.delta eclipse-pydev_3.9.2.orig.tar.xz.id eclipse-pydev_3.9.2.orig.tar.xz.id | 4 ++++ 1 file changed, 4 insertions(+) diff --cc eclipse-pydev_3.9.2.orig.tar.xz.id index 3988d48,836cf88..3a81358 --- a/eclipse-pydev_3.9.2.orig.tar.xz.id +++ b/eclipse-pydev_3.9.2.orig.tar.xz.id @@@ -1,1 -1,1 +1,5 @@@ ++<<<<<<< HEAD +d5e5a1251b5d015f1426842929fa7028a2d66e76 ++======= + 43cb532b1a02a7d34c4d844ced24b8da48daabe2 ++>>>>>>> bcc0d167f4bda26bdaafad355a4cb2eb0191e8c5 -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/eclipse-pydev.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
