fix: merge conflits

Acidiney Dias · Acidiney Dias · commit 4267c3561b56 · 2021-10-21T01:49:05.000+01:00
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "node-dto",
-  "version": "1.0.3",
+  "version": "1.0.4",
   "description": "A small dto lib for nodejs",
   "main": "src/index.js",
   "scripts": {
diff --git a/src/index.js b/src/index.js
@@ -149,14 +149,9 @@ module.exports = {
             }`
           );
         }
-<<<<<<< HEAD
 
         return sql;
       },
     };
   },
 };
-=======
-    }
-}
->>>>>>> 1fb6beaf81dc6eee7b1bbbb52de1b2b964a71695

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "node-dto",`
`3`		`- "version": "1.0.3",`
	`3`	`+ "version": "1.0.4",`
`4`	`4`	`"description": "A small dto lib for nodejs",`
`5`	`5`	`"main": "src/index.js",`
`6`	`6`	`"scripts": {`