Projects >> Terasology >>5fc1318bfd3cf94283266446151c341937fc8e2d

Chunk
Conflicting content 
        });

        commandLine = find("commandLine", UICommandEntry.class);
<<<<<<< HEAD
        commandLine.setTabCompletionEngine(new ConsoleTabCompletionEngine(console));
=======
        getManager().setFocus(commandLine);
        commandLine.setTabCompletionEngine(new CyclingTabCompletionEngine(console, commandNames));
>>>>>>> f8f4f9da688a22962f39b803a9008f4939a8a39f
        commandLine.bindCommandHistory(new ReadOnlyBinding>() {
            @Override
            public List get() {
Solution content 
        });

        commandLine = find("commandLine", UICommandEntry.class);
        getManager().setFocus(commandLine);
        commandLine.setTabCompletionEngine(new CyclingTabCompletionEngine(console, commandNames));
        commandLine.bindCommandHistory(new ReadOnlyBinding>() {
            @Override
            public List get() {
File
ConsoleScreen.java
Developer's decision
Version 2
Kind of conflict
Method invocation