From: Wolfram Schneider <wosch@indexdata.dk>
Date: Tue, 15 Apr 2014 15:15:12 +0000 (+0000)
Subject: Merge branch 'master' of ssh://git.indexdata.com:222/home/git/private/mkws
X-Git-Tag: 1.0.0~948^2~1
X-Git-Url: http://git.indexdata.com/?a=commitdiff_plain;h=bef43024597139e420d84b5c70b85a8f1e699949;hp=bb933359f48299cac4426d4643e6dfa74ed8eb7c;p=mkws-moved-to-github.git

Merge branch 'master' of ssh://git.indexdata.com:222/home/git/private/mkws
---

diff --git a/test/Makefile b/test/Makefile
index b89b4e1..3c420ea 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -85,7 +85,7 @@ node_modules node-modules:
 apache-start:
 	bin/apache-template-update
 	${APACHE_HTTPD} -f `pwd`/${TMP_DIR}/jasmine-dev
-	
+
 apache-stop:
 	@-if [ -e ${TMP_DIR}/mkws-jasmine.pid ]; then \
 	   kill `cat ${TMP_DIR}/mkws-jasmine.pid`; \