Projects information

Chunk

Conflicting content
package com.sk89q.craftbook.gates.world; <<<<<<< HEAD import com.sk89q.craftbook.ic.; import org.bukkit.Server; import org.bukkit.block.Sign; ======= import org.bukkit.Server; import org.bukkit.block.Sign; import com.sk89q.craftbook.ic.AbstractICFactory; import com.sk89q.craftbook.ic.ChipState; import com.sk89q.craftbook.ic.IC; import com.sk89q.craftbook.ic.RestrictedIC; >>>>>>> 31b64784f43ec62c9704ba7b3c499b1a684016f2 /* * @author Silthus

Conflicting content

package com.sk89q.craftbook.gates.world;

<<<<<<< HEAD
import com.sk89q.craftbook.ic.*;
import org.bukkit.Server;
import org.bukkit.block.Sign;
=======
import org.bukkit.Server;
import org.bukkit.block.Sign;

import com.sk89q.craftbook.ic.AbstractICFactory;
import com.sk89q.craftbook.ic.ChipState;
import com.sk89q.craftbook.ic.IC;
import com.sk89q.craftbook.ic.RestrictedIC;
>>>>>>> 31b64784f43ec62c9704ba7b3c499b1a684016f2

/**
 * @author Silthus

Solution content
package com.sk89q.craftbook.gates.world; import com.sk89q.craftbook.ic.; import org.bukkit.Server; import org.bukkit.block.Sign; /* * @author Silthus

File
ItemNotSensor.java

Developer's decision
Version 1

Kind of conflict
Import

Chunk

Conflicting content
super(server); } <<<<<<< HEAD @Override public IC create(Sign sign) { return new ItemNotSensor(getServer(), sign); } @Override public void verify(Sign sign) throws ICVerificationException { ICUtil.verifySignSyntax(sign); } ======= @Override public IC create(Sign sign) { return new ItemNotSensor(getServer(), sign); } >>>>>>> 31b64784f43ec62c9704ba7b3c499b1a684016f2 } }

Conflicting content

	    super(server);
	}

<<<<<<< HEAD
        @Override
        public IC create(Sign sign) {
	        return new ItemNotSensor(getServer(), sign);
        }

	    @Override
	    public void verify(Sign sign) throws ICVerificationException {
		    ICUtil.verifySignSyntax(sign);
	    }
=======
	@Override
	public IC create(Sign sign) {
	    return new ItemNotSensor(getServer(), sign);
	}
>>>>>>> 31b64784f43ec62c9704ba7b3c499b1a684016f2
    }
}

Solution content
@Override public IC create(Sign sign) { return new ItemNotSensor(getServer(), sign); } @Override public void verify(Sign sign) throws ICVerificationException { ICUtil.verifySignSyntax(sign); } } }

File
ItemNotSensor.java

Developer's decision
Version 1

Kind of conflict
Annotation
Method declaration

Chunk

Conflicting content
package com.sk89q.craftbook.gates.world; <<<<<<< HEAD import com.sk89q.craftbook.ic.*; import com.sk89q.craftbook.util.LocationUtil; import com.sk89q.craftbook.util.SignUtil; ======= import java.util.Set; >>>>>>> 31b64784f43ec62c9704ba7b3c499b1a684016f2 import org.bukkit.Chunk; import org.bukkit.Material; import org.bukkit.Server;

Conflicting content

package com.sk89q.craftbook.gates.world;

<<<<<<< HEAD
import com.sk89q.craftbook.ic.*;
import com.sk89q.craftbook.util.LocationUtil;
import com.sk89q.craftbook.util.SignUtil;
=======
import java.util.Set;

>>>>>>> 31b64784f43ec62c9704ba7b3c499b1a684016f2
import org.bukkit.Chunk;
import org.bukkit.Material;
import org.bukkit.Server;

Solution content
package com.sk89q.craftbook.gates.world; import com.sk89q.craftbook.ic.*; import com.sk89q.craftbook.util.LocationUtil; import com.sk89q.craftbook.util.SignUtil; import org.bukkit.Chunk; import org.bukkit.Material; import org.bukkit.Server;

Solution content

package com.sk89q.craftbook.gates.world;

import com.sk89q.craftbook.ic.*;
import com.sk89q.craftbook.util.LocationUtil;
import com.sk89q.craftbook.util.SignUtil;
import org.bukkit.Chunk;
import org.bukkit.Material;
import org.bukkit.Server;

File
ItemSensor.java

Developer's decision
Version 1

Kind of conflict
Import

Chunk

Conflicting content
super(server); } <<<<<<< HEAD @Override public IC create(Sign sign) { return new ItemSensor(getServer(), sign); } @Override public void verify(Sign sign) throws ICVerificationException { ICUtil.verifySignSyntax(sign); } ======= @Override public IC create(Sign sign) { return new ItemSensor(getServer(), sign); } >>>>>>> 31b64784f43ec62c9704ba7b3c499b1a684016f2 } }

Conflicting content

	    super(server);
	}

<<<<<<< HEAD
        @Override
        public IC create(Sign sign) {
	        return new ItemSensor(getServer(), sign);
        }

	    @Override
	    public void verify(Sign sign) throws ICVerificationException {
		    ICUtil.verifySignSyntax(sign);
	    }
=======
	@Override
	public IC create(Sign sign) {
	    return new ItemSensor(getServer(), sign);
	}
>>>>>>> 31b64784f43ec62c9704ba7b3c499b1a684016f2
    }
}

Solution content
@Override public IC create(Sign sign) { return new ItemSensor(getServer(), sign); } @Override public void verify(Sign sign) throws ICVerificationException { ICUtil.verifySignSyntax(sign); } } }

File
ItemSensor.java

Developer's decision
Version 1

Kind of conflict
Annotation
Method declaration

Chunk

Conflicting content
package com.sk89q.craftbook.gates.world; <<<<<<< HEAD import com.sk89q.craftbook.ic.*; import com.sk89q.craftbook.util.LocationUtil; import com.sk89q.craftbook.util.SignUtil; ======= >>>>>>> 31b64784f43ec62c9704ba7b3c499b1a684016f2 import org.bukkit.Server; import org.bukkit.block.Block; import org.bukkit.block.BlockFace;

Conflicting content

package com.sk89q.craftbook.gates.world;

<<<<<<< HEAD
import com.sk89q.craftbook.ic.*;
import com.sk89q.craftbook.util.LocationUtil;
import com.sk89q.craftbook.util.SignUtil;
=======
>>>>>>> 31b64784f43ec62c9704ba7b3c499b1a684016f2
import org.bukkit.Server;
import org.bukkit.block.Block;
import org.bukkit.block.BlockFace;

Solution content
package com.sk89q.craftbook.gates.world; import com.sk89q.craftbook.ic.*; import com.sk89q.craftbook.util.LocationUtil; import com.sk89q.craftbook.util.SignUtil; import org.bukkit.Server; import org.bukkit.block.Block; import org.bukkit.block.BlockFace;

Solution content

package com.sk89q.craftbook.gates.world;

import com.sk89q.craftbook.ic.*;
import com.sk89q.craftbook.util.LocationUtil;
import com.sk89q.craftbook.util.SignUtil;
import org.bukkit.Server;
import org.bukkit.block.Block;
import org.bukkit.block.BlockFace;

File
LightningSummon.java

Developer's decision
Version 1

Kind of conflict
Import

Chunk

Conflicting content
package com.sk89q.craftbook.gates.world; <<<<<<< HEAD import com.sk89q.craftbook.bukkit.CircuitsPlugin; import com.sk89q.craftbook.ic.*; import com.sk89q.craftbook.util.LocationUtil; ======= import java.util.Set; >>>>>>> 31b64784f43ec62c9704ba7b3c499b1a684016f2 import org.bukkit.Chunk; import org.bukkit.Server; import org.bukkit.block.Block;

Conflicting content

package com.sk89q.craftbook.gates.world;

<<<<<<< HEAD
import com.sk89q.craftbook.bukkit.CircuitsPlugin;
import com.sk89q.craftbook.ic.*;
import com.sk89q.craftbook.util.LocationUtil;
=======
import java.util.Set;

>>>>>>> 31b64784f43ec62c9704ba7b3c499b1a684016f2
import org.bukkit.Chunk;
import org.bukkit.Server;
import org.bukkit.block.Block;

Solution content
package com.sk89q.craftbook.gates.world; import com.sk89q.craftbook.bukkit.CircuitsPlugin; import com.sk89q.craftbook.ic.*; import com.sk89q.craftbook.util.LocationUtil; import org.bukkit.Chunk; import org.bukkit.Server; import org.bukkit.block.Block;

Solution content

package com.sk89q.craftbook.gates.world;

import com.sk89q.craftbook.bukkit.CircuitsPlugin;
import com.sk89q.craftbook.ic.*;
import com.sk89q.craftbook.util.LocationUtil;
import org.bukkit.Chunk;
import org.bukkit.Server;
import org.bukkit.block.Block;

File
PlayerDetection.java

Developer's decision
Version 1

Kind of conflict
Import

Chunk

Conflicting content
super(server); } <<<<<<< HEAD @Override public IC create(Sign sign) { return new PlayerDetection(getServer(), sign); } @Override public void verify(Sign sign) throws ICVerificationException { ICUtil.verifySignSyntax(sign); } ======= @Override public IC create(Sign sign) { return new PlayerDetection(getServer(), sign); } >>>>>>> 31b64784f43ec62c9704ba7b3c499b1a684016f2 } }

Conflicting content

	    super(server);
	}

<<<<<<< HEAD
        @Override
        public IC create(Sign sign) {
	        return new PlayerDetection(getServer(), sign);
        }

	    @Override
	    public void verify(Sign sign) throws ICVerificationException {
		    ICUtil.verifySignSyntax(sign);
	    }
=======
	@Override
	public IC create(Sign sign) {
	    return new PlayerDetection(getServer(), sign);
	}
>>>>>>> 31b64784f43ec62c9704ba7b3c499b1a684016f2
    }
}

Solution content
@Override public IC create(Sign sign) { return new PlayerDetection(getServer(), sign); } @Override public void verify(Sign sign) throws ICVerificationException { ICUtil.verifySignSyntax(sign); } } }

File
PlayerDetection.java

Developer's decision
Version 1

Kind of conflict
Annotation
Method declaration

Chunk

Conflicting content
package com.sk89q.craftbook.gates.world; <<<<<<< HEAD import com.sk89q.craftbook.ic.*; ======= >>>>>>> 31b64784f43ec62c9704ba7b3c499b1a684016f2 import org.bukkit.Server; import org.bukkit.block.Block; import org.bukkit.block.Sign;

Conflicting content

package com.sk89q.craftbook.gates.world;

<<<<<<< HEAD
import com.sk89q.craftbook.ic.*;
=======
>>>>>>> 31b64784f43ec62c9704ba7b3c499b1a684016f2
import org.bukkit.Server;
import org.bukkit.block.Block;
import org.bukkit.block.Sign;

Solution content
package com.sk89q.craftbook.gates.world; import com.sk89q.craftbook.ic.*; import org.bukkit.Server; import org.bukkit.block.Block; import org.bukkit.block.Sign;

File
PowerSensor.java

Developer's decision
Version 1

Kind of conflict
Import

Chunk

Conflicting content
super(server); } <<<<<<< HEAD @Override public IC create(Sign sign) { return new PowerSensor(getServer(), sign); } @Override public void verify(Sign sign) throws ICVerificationException { ICUtil.verifySignSyntax(sign); } ======= @Override public IC create(Sign sign) { return new PowerSensor(getServer(), sign); >>>>>>> 31b64784f43ec62c9704ba7b3c499b1a684016f2 } } }

Conflicting content

	    super(server);
	}

<<<<<<< HEAD
		@Override
		public IC create(Sign sign) {
			return new PowerSensor(getServer(), sign);
		}

		@Override
		public void verify(Sign sign) throws ICVerificationException {
			ICUtil.verifySignSyntax(sign);
		}
=======
	@Override
	public IC create(Sign sign) {
	    return new PowerSensor(getServer(), sign);
>>>>>>> 31b64784f43ec62c9704ba7b3c499b1a684016f2
	}
    }
}

Solution content
@Override public IC create(Sign sign) { return new PowerSensor(getServer(), sign); } @Override public void verify(Sign sign) throws ICVerificationException { ICUtil.verifySignSyntax(sign); } } }

File
PowerSensor.java

Developer's decision
Combination

Kind of conflict
Annotation
Method declaration
Method invocation
Method signature
Return statement

Projects >> CraftBook >>8ac47d8a654b3909ed7b6972618dba7f860157d5