fixed merge conflicts

This commit is contained in:
Peter 'Pita' Martischka 2011-07-26 19:30:39 +01:00
commit 6b43d2252b
10 changed files with 65 additions and 57 deletions

View file

@ -3,7 +3,7 @@
hash node-inspector > /dev/null 2>&1 || {
echo "You need to install node-inspector to run the tests!" >&2
echo "You can install it with npm" >&2
echo "Run: npm install node-inspector" >&2
echo "Run: npm install -g node-inspector" >&2
exit 1
}

View file

@ -1,14 +0,0 @@
#!/bin/sh
hash nodeunit > /dev/null 2>&1 || {
echo "You need to install Nodeunit to run the tests!" >&2
echo "You can install it with npm" >&2
echo "Run: npm install nodeunit" >&2
exit 1
}
if [ -d "../bin" ]; then
cd "../"
fi
nodeunit tests