Projects >> Multiverse-Portals >>8628a32d7dfc2bf5c93d46986d243b7b00be030e

Chunk
Conflicting content 
package com.onarandombox.MultiversePortals;

<<<<<<< HEAD
import com.onarandombox.MultiverseCore.api.MVDestination;
import com.onarandombox.MultiverseCore.api.MVWorldManager;
import com.onarandombox.MultiverseCore.api.MultiverseWorld;
import com.onarandombox.MultiverseCore.destination.ExactDestination;
import com.onarandombox.MultiverseCore.destination.InvalidDestination;
import com.onarandombox.MultiversePortals.utils.MultiverseRegion;
=======
import java.util.logging.Level;
>>>>>>> 1bc840452f6fe0e19f745709813193f4e008780f

import org.bukkit.Location;
import org.bukkit.Material;
Solution content 
package com.onarandombox.MultiversePortals;

import java.util.Arrays;
import java.util.Collection;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
import java.util.Stack;
import java.util.logging.Level;

import org.bukkit.Location;
import org.bukkit.Material;
File
MVPortal.java
Developer's decision
Manual
Kind of conflict
Import
Chunk
Conflicting content 
import org.bukkit.entity.Player;
import org.bukkit.permissions.Permission;
import org.bukkit.permissions.PermissionDefault;
<<<<<<< HEAD
import org.bukkit.util.Vector;

import java.util.Arrays;
import java.util.Collection;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
import java.util.Stack;
import java.util.logging.Level;
=======

import com.onarandombox.MultiverseCore.api.MVDestination;
import com.onarandombox.MultiverseCore.api.MVWorldManager;
import com.onarandombox.MultiverseCore.api.MultiverseWorld;
import com.onarandombox.MultiverseCore.destination.ExactDestination;
import com.onarandombox.MultiverseCore.destination.InvalidDestination;
>>>>>>> 1bc840452f6fe0e19f745709813193f4e008780f

public class MVPortal {
    private String name;
Solution content 
import org.bukkit.entity.Player;
import org.bukkit.permissions.Permission;
import org.bukkit.permissions.PermissionDefault;
import org.bukkit.util.Vector;

import com.onarandombox.MultiverseCore.api.MVDestination;
import com.onarandombox.MultiverseCore.api.MVWorldManager;
import com.onarandombox.MultiverseCore.api.MultiverseWorld;
import com.onarandombox.MultiverseCore.destination.ExactDestination;
import com.onarandombox.MultiverseCore.destination.InvalidDestination;
import com.onarandombox.MultiversePortals.utils.MultiverseRegion;

public class MVPortal {
    private String name;
File
MVPortal.java
Developer's decision
Manual
Kind of conflict
Import
Chunk
Conflicting content 
import com.pneumaticraft.commandhandler.multiverse.CommandHandler;
import com.sk89q.worldedit.bukkit.WorldEditAPI;
import com.sk89q.worldedit.bukkit.WorldEditPlugin;
<<<<<<< HEAD
import org.bukkit.command.Command;
import org.bukkit.command.CommandSender;
import org.bukkit.configuration.Configuration;
import org.bukkit.configuration.file.FileConfiguration;
import org.bukkit.configuration.file.YamlConfiguration;
import org.bukkit.entity.Player;
import org.bukkit.permissions.Permission;
import org.bukkit.plugin.PluginManager;
import org.bukkit.plugin.java.JavaPlugin;

import java.io.File;
import java.io.IOException;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.logging.Level;
import java.util.logging.Logger;
=======
>>>>>>> 1bc840452f6fe0e19f745709813193f4e008780f

public class MultiversePortals extends JavaPlugin implements MVPlugin {
Solution content 
import com.pneumaticraft.commandhandler.multiverse.CommandHandler;
import com.sk89q.worldedit.bukkit.WorldEditAPI;
import com.sk89q.worldedit.bukkit.WorldEditPlugin;

public class MultiversePortals extends JavaPlugin implements MVPlugin {
File
MultiversePortals.java
Developer's decision
Version 2
Kind of conflict
Import
Chunk
Conflicting content 
import org.bukkit.Location;

package com.onarandombox.MultiversePortals.utils;

<<<<<<< HEAD
import com.onarandombox.MultiverseCore.MultiverseCore;
import com.onarandombox.MultiverseCore.utils.LocationManipulation;
import com.onarandombox.MultiversePortals.MVPortal;
=======
import java.util.logging.Level;
>>>>>>> 1bc840452f6fe0e19f745709813193f4e008780f

import org.bukkit.ChatColor;
Solution content 
package com.onarandombox.MultiversePortals.utils;

import java.util.logging.Level;

import org.bukkit.ChatColor;
import org.bukkit.Location;
File
PortalFiller.java
Developer's decision
Version 2
Kind of conflict
Import
Chunk
Conflicting content 
import org.bukkit.permissions.Permission;
import org.bukkit.util.Vector;

<<<<<<< HEAD
import java.util.ArrayList;
import java.util.Collection;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
=======
import com.onarandombox.MultiverseCore.api.MultiverseWorld;
import com.onarandombox.MultiversePortals.MVPortal;
import com.onarandombox.MultiversePortals.MultiversePortals;
import com.onarandombox.MultiversePortals.PortalLocation;
>>>>>>> 1bc840452f6fe0e19f745709813193f4e008780f


/**
Solution content 
import org.bukkit.permissions.Permission;
import org.bukkit.util.Vector;

import com.onarandombox.MultiverseCore.api.MultiverseWorld;
import com.onarandombox.MultiversePortals.MVPortal;
import com.onarandombox.MultiversePortals.MultiversePortals;
import com.onarandombox.MultiversePortals.PortalLocation;


/**
File
PortalManager.java
Developer's decision
Version 2
Kind of conflict
Import