Merge branch '1497-fix-tsmerge-when-reading-ascii-file' into integration

Jürgen Knödlseder
2 parents cf33f728 5d83e11b
Showing 1 changed file with 1 additions and 1 deletions
scripts/tsmerge.py
@@ -155,7 +155,7 @@ if __name__ == &quot;__main__&quot;:
     files = kwargs["files"]
     allfiles = []
     if os.path.isfile(files):
-        allfiles = open(files).readlines()   
+        allfiles = open(files).read().splitlines()   
     else:
         allfiles = glob.glob(files)