summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Kowalski <rok@kowalski.gd>2014-03-16 15:35:35 +0100
committerAlexander Shorin <kxepal@apache.org>2014-03-17 00:29:31 +0400
commitc81f2d470d73051617e0395f771c9f364e3f2e47 (patch)
tree2ed0dafcbf5e7e934d040f9aff2a1ed74cde4e06
parent510070c0979b72a111ba865a421a221250fc9350 (diff)
downloadcouchdb-c81f2d470d73051617e0395f771c9f364e3f2e47.tar.gz
fix build
add CONTRIBUTING.md to Makefile.am and license.skip remove duplicate file from Makefile.am This closes #184 Signed-off-by: Alexander Shorin <kxepal@apache.org>
-rw-r--r--license.skip1
-rw-r--r--src/Makefile.am2
2 files changed, 2 insertions, 1 deletions
diff --git a/license.skip b/license.skip
index 984d8696b..56b48bdbd 100644
--- a/license.skip
+++ b/license.skip
@@ -140,6 +140,7 @@
^src/fauxton/readme.md
^src/fauxton/writing_addons.md
^src/fauxton/TODO.md
+^src/fauxton/CONTRIBUTING.md
^src/fauxton/settings.json.*
^src/fauxton/test/test.config.underscore
^src/fauxton/test/mocha/chai.js
diff --git a/src/Makefile.am b/src/Makefile.am
index 43afcf571..f610a3160 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -70,7 +70,6 @@ FAUXTON_FILES = \
fauxton/app/addons/config/resources.js \
fauxton/app/addons/config/views.js \
fauxton/app/addons/config/routes.js \
- fauxton/app/addons/config/views.js \
fauxton/app/addons/config/templates/modal.html \
fauxton/app/addons/config/templates/dashboard.html \
fauxton/app/addons/config/templates/item.html \
@@ -346,4 +345,5 @@ FAUXTON_FILES = \
fauxton/test/runner.html \
fauxton/test/test.config.underscore \
fauxton/TODO.md \
+ fauxton/CONTRIBUTING.md \
fauxton/writing_addons.md