fixed merge conflict

humaan · Jul 25, 2016 · ec50dd9 · ec50dd9
2 parents bf88f59 + 2b419c4
commit ec50dd9
Showing 1 changed file with 25 additions and 0 deletions.
diff --git a/bower.json b/bower.json
@@ -0,0 +1,25 @@
+{
+	"name": "modaal",
+	"description": "An accessible dialog window library for all humans.",
+	"authors": "Humaan - [email protected]",
+	"license": "MIT",
+	"homepage": "https://github.com/humaan/Modaal",
+	"main": [
+	    "dist/css/modaal.css",
+	    "dist/css/modaal.min.css",
+	    "dist/css/modaal.scss",
+	    "dist/js/modaal.js",
+	    "dist/js/modaal.min.js"
+	],
+	"ignore": [
+		"demo",
+		"source",
+		".editorconfig",
+		".gitignore",
+		"LICENSE.txt",
+		"gulpfile.js",
+		"README.md",
+		"index.php",
+		"package.json"
+	]
+}