[fts/el6: 3/3] rebuild for activemq

[MIchal Simon]

commit a7a7dc5fb01d2f6adc6f455443dcd7bede594456
Merge: 4e9e46d 5acfa0f
Author: simonm <michal.simon at cern.ch>
Date:   Tue Feb 11 15:03:30 2014 +0100

    rebuild for activemq

 fts.spec |   14 ++++++++++++++
 1 files changed, 14 insertions(+), 0 deletions(-)
---
diff --cc fts.spec
index 35ed003,bf391cd..70e4482
--- a/fts.spec
+++ b/fts.spec
@@@ -4,7 -4,7 +4,11 @@@
  
  Name: fts
  Version: 3.1.33
++<<<<<<< HEAD
 +Release: 2%{?dist}
++=======
+ Release: 3%{?dist}
++>>>>>>> master
  Summary: File Transfer Service V3
  Group: System Environment/Daemons
  License: ASL 2.0
@@@ -297,8 -297,13 +301,18 @@@ exit 
  
  
  %changelog
++<<<<<<< HEAD
 +* Fri Jan 24 2014 Alejandro Alvarez <aalvarez at cern.ch> - 3.1.33-2
 +  - Fixed bogus date
++=======
+ * Tue Feb 11 2014 Michal Simon <michal.simon at cern.ch> - 3.1.33-3
+   - rebuild for libactivemq-cpp
+ * Mon Nov 18 2013 Alejandro Alvarez Ayllon <aalvarez at cern.ch> - 3.1.33-2
+   - Added missing changelog entry
+   - Fixed bogus date
+ * Tue Oct 29 2013 Michal Simon <michal.simon at cern.ch> - 3.1.33-1
+   - Update for new upstream release
++>>>>>>> master
  * Wed Aug 07 2013 Michal Simon <michal.simon at cern.ch> - 3.1.1-2
    - GenericDbIfce.h includes new blacklisting API
    - no longer linking explicitly to boost libraries with '-mt' sufix