[antlr-maven-plugin: 2/2] Merge branch 'master' of ssh://pkgs.fedoraproject.org/antlr-maven-plugin

[Tom Callaway]

commit 8dda5ece494cb769cdaa9b517454f5d7fbc51fa0
Merge: cd8689e 8235d85
Author: Tom "spot" Callaway <tcallawa at redhat.com>
Date:   Mon Mar 7 14:54:57 2011 -0500

    Merge branch 'master' of ssh://pkgs.fedoraproject.org/antlr-maven-plugin
    
    Conflicts:
    	antlr-maven-plugin.spec

 antlr-maven-plugin.spec |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)
---
diff --cc antlr-maven-plugin.spec
index 206b585,f2ae2c6..86de437
--- a/antlr-maven-plugin.spec
+++ b/antlr-maven-plugin.spec
@@@ -119,9 -117,9 +119,13 @@@ 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
 +
+ * Mon Feb 07 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.1-4.20101012svn12849
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
+ 
  * Wed Oct 13 2010 Tom "spot" Callaway <tcallawa at redhat.com> 2.1-3.20101012svn12849
  - fix provides/obsoletes to replace old (dead) package
  - don't own mavendepmapfragdir, just the files inside it