Projects >> SimpleServer >>21769ac7491cfb76a5f0f9a241ddc81160b9ad12

Chunk
Conflicting content 
  public void execute(Player player, String message) {
    player.getServer().loadResources();
<<<<<<< HEAD
    player.addTMessage(Color.GRAY, "Resources Reloaded!");
=======
    if (player.getServer().permissions.loadsuccess) {
      player.addMessage("\u00a77Resources Reloaded!");
    } else {
      player.addMessage(Color.RED, "Error while reloading permissions.xml. See serverLog for detailed information.");
    }
>>>>>>> 9264d3956b4000300c219e47bb85966a83a6bc5e
  }

  public void execute(Server server, String message) {
Solution content 
  public void execute(Player player, String message) {
    player.getServer().loadResources();
    if (player.getServer().permissions.loadsuccess) {
      player.addTMessage(Color.GRAY, "Resources Reloaded!");
    } else {
      player.addTMessage(Color.RED, "Error while reloading %s. See %s for detailed information.",
                         "permissions.xml", "server.log");
    }
  }

  public void execute(Server server, String message) {
File
ReloadCommand.java
Developer's decision
Manual
Kind of conflict
If statement
Method invocation
Chunk
Conflicting content 
            }

          } else {
<<<<<<< HEAD
            player.addTMessage(Color.RED, "This chest is locked!");
            in.readByte();
=======
            player.addMessage("\u00a7c " + server.l.get("CHEST_LOCKED"));
>>>>>>> 9264d3956b4000300c219e47bb85966a83a6bc5e
            break;
          }
        }
Solution content 
            }

          } else {
            player.addTMessage(Color.RED, "This chest is locked!");
            break;
          }
        }
File
StreamTunnel.java
Developer's decision
Combination
Kind of conflict
Method invocation