Fix conflict in unit tests 04/88104/1
authordglFromAtt <dgl@research.att.com>
Mon, 20 May 2019 18:29:02 +0000 (14:29 -0400)
committerdglFromAtt <dgl@research.att.com>
Mon, 20 May 2019 18:29:08 +0000 (14:29 -0400)
commita26907336f4f04d754689b7750d0cd592f7057bb
treea072b24a790bbf561cb9b2d89389d34fc119832d
parentb6c6c770247f737e7e2cfe52cec6e7a0b7f7178d
Fix conflict in unit tests

Change-Id: I433213a61a9da64278e1ecaa25f067a36e99ce61
Signed-off-by: dglFromAtt <dgl@research.att.com>
Issue-ID: DMAAP-1205
src/test/java/org/onap/dmaap/dbcapi/service/MR_ClusterServiceTest.java