From f2826aa573bfa2dd81d8e2cb2a0901c2252fa6f6 Mon Sep 17 00:00:00 2001
From: Eleanor Saitta <ella@dymaxion.org>
Date: Wed, 16 Dec 2015 14:56:13 -0500
Subject: [PATCH] Fixing up tests

---
 tests/check_results.sh | 2 +-
 tests/run.sh           | 3 ---
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/tests/check_results.sh b/tests/check_results.sh
index ceb01d2..dbda39f 100755
--- a/tests/check_results.sh
+++ b/tests/check_results.sh
@@ -41,7 +41,7 @@ mount -o loop,offset=${OFFSET_VFAT_NORM} ${IMAGE_DEST} ${RESULTS_DIR}
 cp -rf ${RESULTS_DIR}/* actualResults
 umount ${RESULTS_DIR}
 
-
+#TODO: Check if the results were what we expected.
 
 # To make debugging easier
 echo "KittenGroomer: done with tests/check_results.sh" 1>&2
diff --git a/tests/run.sh b/tests/run.sh
index 57762fe..b828e2d 100755
--- a/tests/run.sh
+++ b/tests/run.sh
@@ -2,7 +2,6 @@
 
 # http://pub.phyks.me/respawn/mypersonaldata/public/2014-05-20-11-08-01/
 
-<<<<<<< HEAD
 # To make debugging easier
 echo "KittenGroomer: in tests/run.sh" 1>&2
 
@@ -19,8 +18,6 @@ fi
 TEST_PART_TYPE=${1}
 TEST_SOURCE_TYPE=${2}
 
-=======
->>>>>>> master
 IMAGE='../raspbian-wheezy.img'
 OFFSET_ROOTFS=$((122880 * 512))