From 5b9c09caba29b05005c96716b762ad27c6df21a5 Mon Sep 17 00:00:00 2001
From: Cuong Manh Le <cuong.manhle.vn@gmail.com>
Date: Mon, 22 Jun 2020 10:38:31 +0700
Subject: [PATCH] docs/docs: remove extra text when resolve conflict (#955)

---
 docs/docs/upgrading.md | 1 -
 1 file changed, 1 deletion(-)

diff --git a/docs/docs/upgrading.md b/docs/docs/upgrading.md
index 30f9f150e..cae832319 100644
--- a/docs/docs/upgrading.md
+++ b/docs/docs/upgrading.md
@@ -38,7 +38,6 @@ In `0.9.0`:
 
 option httpchk GET /ping HTTP/1.1\r\nHost:pomerium
 ```
->>>>>>> c29807c3915b2e61d1a53dd007a8871b6494c3c6
 
 # Since 0.8.0