Projects >> jcommune >>a9621dacbc4235ff91fed8bbb95ef3060a46d58f

Chunk
Conflicting content 
        verify(securityService, times(1)).getCurrentUser();
        verify(topicDao, times(1)).saveOrUpdate(Matchers.anyObject());
<<<<<<< HEAD
=======
        verify(branchService, times(1)).get(1l);
>>>>>>> 27360f91b68fc80c80fe55033b8f414d4820a1c7
    }

    /**
Solution content 
        verify(securityService, times(1)).getCurrentUser();
        verify(topicDao, times(1)).saveOrUpdate(Matchers.anyObject());
        verify(branchService, times(1)).get(1l);
    }

    /**
File
TransactionalTopicServiceTest.java
Developer's decision
Version 2
Kind of conflict
Method invocation