From 8dda5ece494cb769cdaa9b517454f5d7fbc51fa0 Mon Sep 17 00:00:00 2001
From: Tom "spot" Callaway <tcallawa@redhat.com>
Date: Mar 07 2011 19:54:57 +0000
Subject: Merge branch 'master' of ssh://pkgs.fedoraproject.org/antlr-maven-plugin


Conflicts:
	antlr-maven-plugin.spec

---

diff --git a/antlr-maven-plugin.spec b/antlr-maven-plugin.spec
index 206b585..86de437 100644
--- a/antlr-maven-plugin.spec
+++ b/antlr-maven-plugin.spec
@@ -119,9 +119,13 @@ rm -rf %{buildroot}
 %{_javadocdir}/%{name}
 
 %changelog
+<<<<<<< HEAD
 * Mon Mar  3 2011 Tom Callaway <spot@fedoraproject.org> 2.2-1.20110307svn13719
 - update to 2.2 tag
 
+* Mon Feb 07 2011 Fedora Release Engineering <rel-eng@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@redhat.com> 2.1-3.20101012svn12849
 - fix provides/obsoletes to replace old (dead) package
 - don't own mavendepmapfragdir, just the files inside it