#380 merged dev_tsplugin into master

devonfw · Jul 5, 2017 · ef44ade · ef44ade
2 parents 2fe4729 + 4820d8f
commit ef44ade
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/cobigen/cobigen-tsplugin/pom.xml b/cobigen/cobigen-tsplugin/pom.xml
@@ -3,7 +3,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>cobigen-tsplugin</artifactId>
 	<name>CobiGen - TypeScript Plug-in</name>
-	<version>1.0.0</version>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>jar</packaging>
 
 	<parent>

diff --git a/...obigen-tsplugin/src/main/java/com/capgemini/cobigen/tsplugin/merger/TypeScriptMerger.java b/...obigen-tsplugin/src/main/java/com/capgemini/cobigen/tsplugin/merger/TypeScriptMerger.java
@@ -187,6 +187,7 @@ private String readMergedContentsFile(File output, String targetCharset) throws
             while ((line = br.readLine()) != null) {
                 if (line.startsWith("import ")) {
                     imports = imports.concat(line);
+                    imports = imports.concat("\n");
                 } else {
                     mergedContents = mergedContents.concat(line);
                 }