Projects >> eucalyptus >>89486bb86f1506a526cb7fa9c1010ef32c37d844

Chunk
Conflicting content 
            enableStorage = false;
            LOG.warn("Could not initialize block manager");
        }
<<<<<<< HEAD
=======
        startup();
        sharedMode = Bukkit.getSharedMode();
        if(!sharedMode)
            checkWalrusConnection();
        //TODO: inform CLC
        //StorageControllerHeartbeatMessage heartbeat = new StorageControllerHeartbeatMessage(StorageProperties.SC_ID);
>>>>>>> a6d4be86e1ba08f614b3c40fd8a44b6e1e6d54a6
    }

    public Storage() {}
Solution content 
            enableStorage = false;
            LOG.warn("Could not initialize block manager");
        }
        startup();
        sharedMode = Bukkit.getSharedMode();
        if(!sharedMode)
            checkWalrusConnection();
        //TODO: inform CLC
        //StorageControllerHeartbeatMessage heartbeat = new StorageControllerHeartbeatMessage(StorageProperties.SC_ID);
    }

    public Storage() {}
File
Storage.java
Developer's decision
Version 2
Kind of conflict
Attribute
Comment
If statement
Method invocation