Skip to content

Commit

Permalink
resolved conflict
Browse files Browse the repository at this point in the history
  • Loading branch information
mariuszkubis committed Sep 22, 2016
1 parent 83970f1 commit 7932fcc
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion src/main/java/com/cognifide/secureaem/cli/Main.java
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
import java.io.IOException;
import java.io.InputStream;
import java.io.InputStreamReader;
import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
import java.util.List;

Expand Down Expand Up @@ -60,7 +61,7 @@ private static BufferedReader getBufferedReader(CommandLine cmdLine) throws File
reader = new BufferedReader(new FileReader(cmdLine.getOptionValue("suite")));
} else {
InputStream is = Main.class.getClass().getResourceAsStream(DEFAULT_TEST_SUITE_PATH);
reader = new BufferedReader(new InputStreamReader(is));
reader = new BufferedReader(new InputStreamReader(is, StandardCharsets.UTF_8));
}
return reader;
}
Expand Down

0 comments on commit 7932fcc

Please sign in to comment.