Projects >> fitnesse >>5d7a93d6022fa0c57061c693dffb039832274995

Chunk
Conflicting content
  public void start() throws Exception {
    slimRunner.asynchronousStart();
<<<<<<< HEAD

    slimClient = new SlimClient(determineSlimHost(), slimSocket);
=======
    String slimHost = page.getData().getVariable("SLIM_HOST");
    if (!slimHost)
      slimHost = "localhost"
    slimClient = new SlimClient(slimHost, slimSocket);
>>>>>>> ab463805025aef391722565fa4a7e189f4ea0fd3
    try {
      waitForConnection();
      started = true;
Solution content
  public void start() throws Exception {
    slimRunner.asynchronousStart();

    slimClient = new SlimClient(determineSlimHost(), slimSocket);
    try {
      waitForConnection();
      started = true;
File
SlimTestSystem.java
Developer's decision
Version 1
Kind of conflict
Attribute
Method invocation