Projects >> movsim >>db952595a57161f5c913d728dfcf23ecda11cc72

Chunk
Conflicting content 
            Controller controller = new SimulatorGUIController(simulator);
        } else {
            // commandline tool
<<<<<<< HEAD
            Controller controller = new SimulatorController(simulator); // or
                                                                        // just:
                                                                        // simulator.run();
=======
            final Controller controller = new SimulatorController(simulator); 
>>>>>>> 5d20f451922f726061e6c7a5cf6febed17e254b0
        }

    }
Solution content 
            Controller controller = new SimulatorGUIController(simulator);
        } else {
            // commandline tool
            final Controller controller = new SimulatorController(simulator); 
        }

    }
File
App.java
Developer's decision
Version 2
Kind of conflict
Comment
Method invocation
Variable
Chunk
Conflicting content 
     */
    private static void initLocalizationAndLogger() {
        Locale.setDefault(Locale.US);
<<<<<<< HEAD

        // BasicConfigurator for log4j replaced with PropertyConfigurator.
        // log4j.properties from file system overrides log4j.properties from
        // resources
        final File file = new File("log4j.properties");
        if (file.exists() && file.isFile()) {
=======
            final File file = new File("log4j.properties");
            if (file.exists() && file.isFile()) {
>>>>>>> 5d20f451922f726061e6c7a5cf6febed17e254b0
            PropertyConfigurator.configure("log4j.properties");
        } else {
            final URL log4jConfig = App.class.getResource("/sim/log4j.properties");
Solution content 
     */
    private static void initLocalizationAndLogger() {
        Locale.setDefault(Locale.US);
            final File file = new File("log4j.properties");
            if (file.exists() && file.isFile()) {
            PropertyConfigurator.configure("log4j.properties");
        } else {
            final URL log4jConfig = App.class.getResource("/sim/log4j.properties");
File
App.java
Developer's decision
Version 2
Kind of conflict
Comment
If statement
Method invocation
Variable