Projects >> cloudname >>899d86afbc4fef36309e957b1249c5a820990afb

Chunk
Conflicting content 
        }
    }

<<<<<<< HEAD
    /**
     * The coordinate exists, and it was assumed it did not.
     */
    public static class CoordinateExist  extends CloudnameException {
        public CoordinateExist() {
            super();
        }
    }

    /**
     * The coordinate the user tried to destroy is claimed.
     */
    public static class CoordinateIsClaimed extends CloudnameException {
        public CoordinateIsClaimed() {
            super();
        }

        public CoordinateIsClaimed(Throwable t) {
            super(t);
        }
    }

    /**
     * The coordinate the user tried to destroy has config nodes.
     */
    public static class CoordinateHasConfig extends CloudnameException {
        public CoordinateHasConfig() {
            super();
        }

        public CoordinateHasConfig(Throwable t) {
            super(t);
=======
    public static class CouldNotConnectToStorage extends CloudnameException {
        public CouldNotConnectToStorage(Throwable t) {
            super(t);
        }
        
        public CouldNotConnectToStorage(String message) {
            super(message);
>>>>>>> c44739265b4ccd6641b3b56b433c34cfee707890
        }
    }
Solution content 
        }
    }

    /**
     * The coordinate exists, and it was assumed it did not.
     */
    public static class CoordinateExist  extends CloudnameException {
        public CoordinateExist() {
            super();
        }
    }

    /**
     * The coordinate the user tried to destroy is claimed.
     */
    public static class CoordinateIsClaimed extends CloudnameException {
        public CoordinateIsClaimed() {
            super();
        }

        public CoordinateIsClaimed(Throwable t) {
            super(t);
        }
    }

    /**
     * The coordinate the user tried to destroy has config nodes.
     */
    public static class CoordinateHasConfig extends CloudnameException {
        public CoordinateHasConfig() {
            super();
        }

        public CoordinateHasConfig(Throwable t) {
            super(t);
        }
    }

    public static class CouldNotConnectToStorage extends CloudnameException {
        public CouldNotConnectToStorage(Throwable t) {
            super(t);
        }
        
        public CouldNotConnectToStorage(String message) {
            super(message);
        }
    }
File
CloudnameException.java
Developer's decision
Manual
Kind of conflict
Class declaration
Class signature
Comment
Method declaration
Method invocation
Method signature
Chunk
Conflicting content 
import org.apache.zookeeper.ZooDefs.Ids;
import org.apache.zookeeper.KeeperException;

<<<<<<< HEAD
import java.util.List;
=======
import java.util.concurrent.TimeUnit;
>>>>>>> c44739265b4ccd6641b3b56b433c34cfee707890
import java.util.logging.Logger;

import java.util.concurrent.CountDownLatch;
Solution content 
import org.apache.zookeeper.ZooDefs.Ids;
import org.apache.zookeeper.KeeperException;

import java.util.concurrent.TimeUnit;

import java.util.logging.Logger;

import java.util.concurrent.CountDownLatch;
File
ZkCloudname.java
Developer's decision
Version 2
Kind of conflict
Import