[activemq] 05/05: resolve more comment timestamp inconsistencies

[Tony Mancill]

This is an automated email from the git hooks/post-receive script.

tmancill pushed a commit to branch master
in repository activemq.

commit 3cb281be0b55f27a701cf4496f046e0934dbd50d
Author: tony mancill <tmancill at debian.org>
Date:   Wed Aug 27 13:29:49 2014 -0700

    resolve more comment timestamp inconsistencies
    
    inconsistencies between upstream and the debian master branch
---
 .../java/org/apache/activemq/ra/JmsXARollback2CxTransactionTest.java  | 2 +-
 kahadb/src/main/java/org/apache/kahadb/index/BTreeIndex.java          | 4 ----
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/activemq-ra/src/test/java/org/apache/activemq/ra/JmsXARollback2CxTransactionTest.java b/activemq-ra/src/test/java/org/apache/activemq/ra/JmsXARollback2CxTransactionTest.java
index db2d7c7..60f2732 100644
--- a/activemq-ra/src/test/java/org/apache/activemq/ra/JmsXARollback2CxTransactionTest.java
+++ b/activemq-ra/src/test/java/org/apache/activemq/ra/JmsXARollback2CxTransactionTest.java
@@ -169,4 +169,4 @@ public class JmsXARollback2CxTransactionTest extends JmsQueueTransactionTest {
 
     }
 
-}
+}
\ No newline at end of file
diff --git a/kahadb/src/main/java/org/apache/kahadb/index/BTreeIndex.java b/kahadb/src/main/java/org/apache/kahadb/index/BTreeIndex.java
index 5f2e7a4..07f5761 100644
--- a/kahadb/src/main/java/org/apache/kahadb/index/BTreeIndex.java
+++ b/kahadb/src/main/java/org/apache/kahadb/index/BTreeIndex.java
@@ -64,11 +64,7 @@ public class BTreeIndex<Key,Value> implements Index<Key,Value> {
     /**
      * Interface used to determine the simple prefix of two keys.
      *
-<<<<<<< HEAD
-     * , $Date: 2011-02-16 13:58:54 +0000 (Wed, 16 Feb 2011) $
-=======
      * , $Date: 2011-02-16 05:58:54 -0800 (Wed, 16 Feb 2011) $
->>>>>>> upstream/5.6.0+dfsg1
      */
     static public interface Prefixer<Key> {
         

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/activemq.git