merge with master

martinroob · May 3, 2017 · 4e50c8f · 4e50c8f
2 parents 0f015c7 + 8ede4cd
commit 4e50c8f
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/src/xliffmerge/xliff-merge-parameters.ts b/src/xliffmerge/xliff-merge-parameters.ts
@@ -323,4 +323,4 @@ export class XliffMergeParameters {
     public useSourceAsTarget(): boolean {
         return (isNullOrUndefined(this._useSourceAsTarget)) ? true : this._useSourceAsTarget;
     }
-}
+}
diff --git a/src/xliffmerge/xliff-merge.spec.ts b/src/xliffmerge/xliff-merge.spec.ts
@@ -306,7 +306,8 @@ describe('XliffMerge test spec', () => {
                     defaultLanguage: 'de',
                     srcDir: WORKDIR,
                     genDir: WORKDIR,
-                    i18nFile: MASTERFILE
+                    i18nFile: MASTERFILE,
+		    useSourceAsTarget: false
                 }
             };
             let xliffMergeCmd = XliffMerge.createFromOptions(commandOut, {languages: ['de']}, profileContent);

diff --git a/src/xliffmerge/xliff-merge.ts b/src/xliffmerge/xliff-merge.ts
@@ -278,4 +278,4 @@ export class XliffMerge {
         }
     }
 
-}
+}