Projects >> thucydides >>9cb999c4719da7c340c9c74bcec1e05adbff8eee

Chunk
Conflicting content 
import net.thucydides.core.model.TestOutcome;
import net.thucydides.core.model.TestStepFactory;
import net.thucydides.core.reports.TestOutcomes;
<<<<<<< HEAD
import net.thucydides.core.reports.html.history.TestResultSnapshot;
import net.thucydides.core.util.ExtendedTemporaryFolder;
=======
>>>>>>> acb19678a09bba56f9a63d28fdef9e473c6b4a18
import net.thucydides.core.util.MockEnvironmentVariables;
import org.joda.time.DateTime;
import org.junit.Before;
Solution content 
import net.thucydides.core.model.TestOutcome;
import net.thucydides.core.model.TestStepFactory;
import net.thucydides.core.reports.TestOutcomes;
import net.thucydides.core.util.ExtendedTemporaryFolder;
import net.thucydides.core.util.MockEnvironmentVariables;
import org.joda.time.DateTime;
import org.junit.Before;
File
WhenTrackingTestResultsOverTime.java
Developer's decision
Combination
Kind of conflict
Import
Chunk
Conflicting content 
        assertThat(loadedEnvironmentVariables.getProperty("test.property"), is("set"));
    }

<<<<<<< HEAD
    @SuppressWarnings("static-access")
	private void writeToPropertiesFile(String... lines) throws IOException, InterruptedException {
=======
    private void writeToPropertiesFile(String... lines) throws IOException {
>>>>>>> acb19678a09bba56f9a63d28fdef9e473c6b4a18
        thucydidesPropertiesFile = new File(homeDirectory, "thucydides.properties");
        thucydidesPropertiesFile.setReadable(true);
        thucydidesPropertiesFile.setWritable(true);
Solution content 
        assertThat(loadedEnvironmentVariables.getProperty("test.property"), is("set"));
    }


    @SuppressWarnings("static-access")
	private void writeToPropertiesFile(String... lines) throws IOException, InterruptedException {
        thucydidesPropertiesFile = new File(homeDirectory, "thucydides.properties");
        thucydidesPropertiesFile.setReadable(true);
        thucydidesPropertiesFile.setWritable(true);
File
WhenLoadingPreferencesFromALocalPropertiesFile.java
Developer's decision
Version 1
Kind of conflict
Annotation
Method signature