Fix conflict in unit tests 04/88104/1
[dmaap/dbcapi.git] / src / test /
drwxr-xr-x   ..
drwxr-xr-x - java
drwxr-xr-x - resources