From 60dde15f90aeaedf56ab3bd54fbb20bb7488744e Mon Sep 17 00:00:00 2001
From: Geoff Taylor <kidunot89@gmail.com>
Date: Wed, 26 Feb 2020 20:06:00 -0500
Subject: [PATCH] syntax error fixed

---
 docs/content/contributing/2-local-testing.md | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/docs/content/contributing/2-local-testing.md b/docs/content/contributing/2-local-testing.md
index d8052c82..a6e229c3 100644
--- a/docs/content/contributing/2-local-testing.md
+++ b/docs/content/contributing/2-local-testing.md
@@ -222,8 +222,6 @@ $actual = graphql( array( 'query' => $query ) );
 
 ## Run test expecting success
 
-<<<<<<< HEAD
 # Going Forward
-=======
 ## Writing your first test
->>>>>>> Update docs/content/contributing/2-local-testing.md
+