Projects >> openengsb >>8d5a01f6163c9e93f46cbb41bc87dc939b2cc90e

Chunk
Conflicting content 
    }

    protected void mockAuthentication() throws UserNotFoundException, UserExistsException {
<<<<<<< HEAD
=======
        context.putBean("authenticationContext", new ShiroContext());
>>>>>>> 1e4a1200a89b6f11e9e2992e21bfdd986ac1d072
        authConnector = new UsernamePasswordServiceImpl();
        authConnector.setUserManager(userManager);
        context.putBean("authenticator", authConnector);
Solution content 
    }

    protected void mockAuthentication() throws UserNotFoundException, UserExistsException {
        context.putBean("authenticationContext", new ShiroContext());
        authConnector = new UsernamePasswordServiceImpl();
        authConnector.setUserManager(userManager);
        context.putBean("authenticator", authConnector);
File
AbstractUITest.java
Developer's decision
Version 2
Kind of conflict
Method invocation