From 5cdcd69713c12fc09a1f5d51ffca30210051d11e Mon Sep 17 00:00:00 2001
From: King <kingdavidmartins@users.noreply.github.com>
Date: Wed, 3 Jan 2018 07:06:44 -0500
Subject: [PATCH] fix package merge conflict

---
 package.json | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index 4b0f2407e..75cbf472f 100644
--- a/package.json
+++ b/package.json
@@ -1,25 +1,31 @@
 {
-  "dependencies": {
+  "devDependencies": {
+    "babel-preset-env": "^1.6.1",
+    "chalk": "^2.3.0",
     "fs-extra": "^4.0.2",
     "html-minifier": "^3.5.7",
     "markdown-it": "^8.4.0",
     "node-sass": "^4.7.2",
     "prettier": "^1.9.2",
+    "rollup": "^0.53.2",
+    "rollup-plugin-babel": "^3.0.3",
+    "rollup-plugin-babel-minify": "^3.1.2",
     "semistandard": "^11.0.0",
-    "chalk": "^2.3.0",
     "tape": "^4.8.0"
   },
   "name": "30-seconds-of-code",
   "description": "A collection of useful JavaScript snippets.",
-  "version": "1.0.0",
-  "main": "index.js",
+  "version": "0.0.1",
+  "main": "dist/_30s.js",
+  "module": "dist/_30s.esm.js",
   "scripts": {
     "builder": "node ./scripts/build.js",
     "linter": "node ./scripts/lint.js",
     "tagger": "node ./scripts/tag.js",
     "webber": "node ./scripts/web.js",
     "tdd": "node ./scripts/tdd.js",
-    "test": "tape test/**/*.test.js | tap-spec"
+    "test": "tape test/**/*.test.js | tap-spec",
+    "module": "node ./scripts/module.js"
   },
   "repository": {
     "type": "git",