fixed merge conflicts

3 files changed, 1 insertions, 15 deletions

diff --git a/bin/runDebug.sh b/bin/debugRun.sh
index 041edbb6..014d11cd 100755
--- a/bin/runDebug.sh
+++ b/bin/debugRun.sh
@@ -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 
 }
 
diff --git a/bin/runTests.sh b/bin/runTests.sh
deleted file mode 100755
index aa36dbba..00000000
--- a/bin/runTests.sh
+++ /dev/null
@@ -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
diff --git a/bin/runSafe.sh b/bin/safeRun.sh
index d7d2b99c..d7d2b99c 100755
--- a/bin/runSafe.sh
+++ b/bin/safeRun.sh