Resolved merge conflict

Mobius1 · Aug 18, 2017 · 0f9a642 · 0f9a642
2 parents 201f094 + d8fa162
commit 0f9a642
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/bower.json b/bower.json
@@ -1,8 +1,9 @@
 {
     "name": "vanilla-datatables",
-    "version": "1.3.3",
+    "version": "1.3.2",
+    "main": "src/vanilla-dataTables.js",
     "ignore": [
         ".gitattributes",
         "README.md"
     ]
-}
+}
diff --git a/package.json b/package.json
@@ -2,7 +2,7 @@
   "name": "vanilla-datatables",
   "version": "1.3.3",
   "description": "A lightweight, dependency-free javascript HTML table plugin.",
-  "main": "vanilla-dataTables.min.js",
+  "main": "src/vanilla-dataTables.js",
   "scripts": {
     "test": "grunt test"
   },