From 632cbc22bb3e4448d9b9b48db1d7564b3e065b30 Mon Sep 17 00:00:00 2001
From: sikofitt <sikofitt@gmail.com>
Date: Tue, 19 Jul 2016 15:04:02 -0700
Subject: [PATCH] Formatting

---
 tests/Sikofitt/Tests/ArrayObjectArrayTest.php | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/tests/Sikofitt/Tests/ArrayObjectArrayTest.php b/tests/Sikofitt/Tests/ArrayObjectArrayTest.php
index 4fa0c35..50c3181 100644
--- a/tests/Sikofitt/Tests/ArrayObjectArrayTest.php
+++ b/tests/Sikofitt/Tests/ArrayObjectArrayTest.php
@@ -3,15 +3,7 @@
 /*
  * This file is part of ArrayObjectArray.
  *
-<<<<<<< HEAD
  * (copyleft) R. Eric Wheeler <sikofitt@gmail.com>
-=======
- * @file ArrayObjectArrayTest.php
- *
- * R. Eric Wheeler <sikofitt@gmail.com>
- *
- * 7/19/16 / 1:58 PM
->>>>>>> refs/remotes/origin/master
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.