Skip to content
Snippets Groups Projects
Commit cca6e6c7 authored by Shivane Sabharwal's avatar Shivane Sabharwal
Browse files

Fixed merge

parents 93af7b48 750f54f3
No related branches found
No related tags found
No related merge requests found
No preview for this file type
......@@ -4,6 +4,7 @@ import java.io.BufferedReader;
import java.util.stream.Collectors;
import java.io.InputStream;
import java.io.InputStreamReader;
import java.nio.charset.Charset;
/** Utility functions for general use. */
......@@ -23,7 +24,8 @@ public class Utils {
Utils.class.getClassLoader().getResourceAsStream(fileName);
if (is != null) {
BufferedReader reader =
new BufferedReader(new InputStreamReader(is));
new BufferedReader
(new InputStreamReader(is, Charset.forName("UTF-8")));
return reader.lines().collect
(Collectors.joining(System.lineSeparator()));
}
......
This diff is collapsed.
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment