[antlr-maven-plugin] 2.2

[Tom Callaway]

commit e68dc84da01cc2c38af433dc9d9b002dd27f1b86
Author: Tom "spot" Callaway <tcallawa at redhat.com>
Date:   Mon Mar 7 14:56:01 2011 -0500

    2.2

 antlr-maven-plugin.spec |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)
---
diff --git a/antlr-maven-plugin.spec b/antlr-maven-plugin.spec
index 86de437..b56b748 100644
--- a/antlr-maven-plugin.spec
+++ b/antlr-maven-plugin.spec
@@ -119,7 +119,6 @@ rm -rf %{buildroot}
 %{_javadocdir}/%{name}
 
 %changelog
-<<<<<<< HEAD
 * Mon Mar  3 2011 Tom Callaway <spot at fedoraproject.org> 2.2-1.20110307svn13719
 - update to 2.2 tag