Projects >> curator >>95c2d1c053135736c7e930ac5bbe5d6137230ecd

Chunk
Conflicting content
        Preconditions.checkState(!executorService.isShutdown(), "already started");

        client.getConnectionStateListenable().addListener(connectionStateListener);
<<<<<<< HEAD
        executorService.submit
        (
            new Callable()
            {
                @Override
                public Void call() throws Exception
=======
        mainLoopTask = executorService.submit
            (
                new Callable()
>>>>>>> 8cd8347c8fb4406e7eb41dafe20abcdd52d8818d
                {
                    @Override
                    public Void call() throws Exception
Solution content
        Preconditions.checkState(!executorService.isShutdown(), "already started");

        client.getConnectionStateListenable().addListener(connectionStateListener);
        executorService.submit
        (
            new Callable()
            {
                @Override
                public Void call() throws Exception
                {
File
PathChildrenCache.java
Developer's decision
Combination
Kind of conflict
Attribute
Method invocation