[jbehave-scm] [scm-core][60] fix to avoid merge conflict

[Alex Lehmann]

commit 69133303cf95f9de0cd4c083d169777e157037e5
Author:     Alex Lehmann <alexl...@gmail.com>
AuthorDate: Sat Dec 17 01:17:43 2011 +0100
Commit:     Alex Lehmann <alexl...@gmail.com>
CommitDate: Sat Dec 17 01:17:43 2011 +0100

    fix to avoid merge conflict

diff --git a/distribution/src/lib/ant/maven-ant-tasks-2.1.3.jar 
b/distribution/src/lib/ant/maven-ant-tasks-2.1.3.jar
new file mode 100644
index 0000000..bec446f
Binary files /dev/null and b/distribution/src/lib/ant/maven-ant-tasks-2.1.3.jar 
differ
diff --git a/distribution/src/lib/antlib/maven-ant-tasks-2.1.3.jar 
b/distribution/src/lib/antlib/maven-ant-tasks-2.1.3.jar
deleted file mode 100644
index bec446f..0000000
Binary files a/distribution/src/lib/antlib/maven-ant-tasks-2.1.3.jar and 
/dev/null differ