From 4a3bd0795cce72c396656acde4792e71a38ae988 Mon Sep 17 00:00:00 2001
From: radswiat <rad.swiat@gmail.com>
Date: Thu, 20 Oct 2016 10:12:15 +0100
Subject: [PATCH] Utils file fix

---
 dist/core/utils.js | 3 ++-
 src/core/utils.ts  | 6 ++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/dist/core/utils.js b/dist/core/utils.js
index cc2f09a..c0476f2 100644
--- a/dist/core/utils.js
+++ b/dist/core/utils.js
@@ -4,7 +4,7 @@ var Utils = (function () {
     Utils.isArgv = function (arg) {
         return process.argv.indexOf("--" + arg) >= 0 ? true : false;
     };
-    Utils.merge_options = function (obj1, obj2) {
+    Utils.merge = function (obj1, obj2) {
         var obj3 = {};
         for (var attrname in obj1) {
             obj3[attrname] = obj1[attrname];
@@ -16,3 +16,4 @@ var Utils = (function () {
     };
     return Utils;
 }());
+module.exports = Utils;
diff --git a/src/core/utils.ts b/src/core/utils.ts
index edd7a88..6c3fc2c 100644
--- a/src/core/utils.ts
+++ b/src/core/utils.ts
@@ -10,11 +10,13 @@ class Utils{
      * @param obj2
      * @returns obj3 a new object based on obj1 and obj2
      */
-    static merge_options(obj1,obj2){
+    static merge(obj1,obj2){
         var obj3 = {};
         for (var attrname in obj1) { obj3[attrname] = obj1[attrname]; }
         for (var attrname in obj2) { obj3[attrname] = obj2[attrname]; }
         return obj3;
     }
 
-}
\ No newline at end of file
+}
+
+module.exports = Utils;
\ No newline at end of file