From 490ba8e19124146d7b1d5a66cdf2337a984cf2e1 Mon Sep 17 00:00:00 2001
From: Jason Coleman <33220397+ideadude@users.noreply.github.com>
Date: Mon, 13 May 2019 14:53:08 -0400
Subject: [PATCH] Removed git merge stuff in comment

---
 tests/test-save.php | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/tests/test-save.php b/tests/test-save.php
index f0c07e526..8e78f89e8 100755
--- a/tests/test-save.php
+++ b/tests/test-save.php
@@ -16,11 +16,7 @@ class Test_Caldera_Forms_Save extends Caldera_Forms_Test_Case {
 	 *
 	 * @since 1.4.0
 	 *
-<<<<<<< HEAD
 	 * @group db
-=======
-=	 * @group db
->>>>>>> 1eed496cac83b22be03e5ba996c76afee19ed4a2
 	 * @group save
 	 * @group entry
 	 *