From 63c1d222402be0cdb02cfce9658909dd46df298e Mon Sep 17 00:00:00 2001
From: Ian Norden <iannordenn@gmail.com>
Date: Tue, 12 May 2020 15:30:22 -0500
Subject: [PATCH] typo fix

---
 documentation/custom-transformers.md | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/documentation/custom-transformers.md b/documentation/custom-transformers.md
index 33894856..d45afcdf 100644
--- a/documentation/custom-transformers.md
+++ b/documentation/custom-transformers.md
@@ -100,11 +100,7 @@ The config provides information for composing a set of transformers from externa
 
 [client]
     ipcPath  = "/Users/user/Library/Ethereum/geth.ipc"
-<<<<<<< HEAD
     wsPath   = "ws://127.0.0.1:8546"
-=======
-    wsPath   = "http://127.0.0.1:"
->>>>>>> review fixes
 
 [exporter]
     home     = "github.com/vulcanize/vulcanizedb"