From fa511fd0ee86249c9f1365c21bd3c43bb41a95b9 Mon Sep 17 00:00:00 2001
From: Ralph Asendeteufrer <ralph@colosa.com>
Date: Fri, 7 Dec 2012 10:28:20 -0400
Subject: [PATCH] Adding changes at time to resolve a comflict

---
 env_unittest.sh     | 1 +
 tests/bootstrap.php | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/env_unittest.sh b/env_unittest.sh
index dbbe6539e..2e16d4ded 100755
--- a/env_unittest.sh
+++ b/env_unittest.sh
@@ -1,5 +1,6 @@
 #!/bin/bash
 
+
 if [ $1 = '-d' ] ; then
   export PM_UNIT_DB_USER=root
   export PM_UNIT_DB_NAME=wf_ralph
diff --git a/tests/bootstrap.php b/tests/bootstrap.php
index 0aab440ae..1e8adc2df 100644
--- a/tests/bootstrap.php
+++ b/tests/bootstrap.php
@@ -1,7 +1,7 @@
 <?php
 // ProcessMaker Test Unit Bootstrap
-
 // Defining the PATH_SEP constant, he we are defining if the the path separator symbol will be '\\' or '/'
+
 define('PATH_SEP', '/');
 
 if (!defined('__DIR__')) {