Projects >> dropwizard >>01119067056d70deae0d8db155121c82ac658fbc

Chunk
Conflicting content 
            for (ServerLifecycleListener listener : environment.getServerListeners()) {
                listener.serverStarted(server);
            }
<<<<<<< HEAD

            if (blocking) {
                server.join();
            }
=======
>>>>>>> 9f4f6e20cb1f3dfee5b638c90d7282aebb0083dd
        } catch (Exception e) {
            logger.error("Unable to start server, shutting down", e);
            server.stop();
Solution content 
            for (ServerLifecycleListener listener : environment.getServerListeners()) {
                listener.serverStarted(server);
            }
        } catch (Exception e) {
            logger.error("Unable to start server, shutting down", e);
            server.stop();
File
ServerCommand.java
Developer's decision
Version 2
Kind of conflict
If statement