Correct for merge errors.
authorDennis M. Sosnoski <dsosnoski@apache.org>
Mon, 10 Feb 2014 10:09:31 +0000 (10:09 +0000)
committerDennis M. Sosnoski <dsosnoski@apache.org>
Mon, 10 Feb 2014 10:09:31 +0000 (10:09 +0000)
commit7c9df9d7f70bad77f25c149b432a001640acb33e
treed5afc68cda2f0f5be12160abc4267d52af7a76aa
parent9879f3e1255d6a19dca7e9a167f647f8fa30f935
Correct for merge errors.

git-svn-id: https://svn.apache.org/repos/asf/cxf/trunk@1566561 13f79535-47bb-0310-9956-ffa450edef68
rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/soap/RetransmissionQueueImpl.java