| Chunk |
|---|
| Conflicting content |
|---|
gutschriftText = scanner.useDelimiter("\\A").next();
}
<<<<<<< HEAD
kaufText = new Scanner(getClass().getResourceAsStream("Wertpapierabrechnung_Kauf.txt"), "UTF-8").useDelimiter(
"\\A").next();
gutschrift2 = new Scanner(getClass().getResourceAsStream("Gutschrift2.txt"), "UTF-8").useDelimiter(
"\\A").next();
=======
try (Scanner scanner = new Scanner(getClass().getResourceAsStream("Wertpapierabrechnung_Kauf.txt"), "UTF-8");)
{
kaufText = scanner.useDelimiter("\\A").next();
}
>>>>>>> 1cd5f4094c6e1837a0fbda22870701ac1c0f202b
}
@Test |
| Solution content |
|---|
gutschriftText = scanner.useDelimiter("\\A").next();
}
try (Scanner scanner = new Scanner(getClass().getResourceAsStream("Wertpapierabrechnung_Kauf.txt"), "UTF-8");)
{
kaufText = scanner.useDelimiter("\\A").next();
}
try (Scanner scanner = new Scanner(getClass().getResourceAsStream("Gutschrift2.txt"), "UTF-8");)
{
gutschrift2 = scanner.useDelimiter("\\A").next();
}
}
@Test |
| File |
|---|
| ComdirectPDFExtractorTest.java |
| Developer's decision |
|---|
| Manual |
| Kind of conflict |
|---|
| Attribute |
| Method invocation |