resolve merge conflicts

2015-02-17 21:30:41 -05:00
parent 3a6e50db99 b99ce3736f
commit 9c71cc6d1f
9 changed files with 139 additions and 38 deletions
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
  "name": "css-layout",
  "version": "0.0.1",
  "description": "Reimplementation of CSS layout using pure JavaScript",
-  "main": "src/Layout.js",
+  "main": "src/main.js",
  "scripts": {
    "pretest": "./node_modules/eslint/bin/eslint.js src",
    "test": "./node_modules/karma/bin/karma start ./karma.conf.js --single-run"