From 799c942200945cded1090f1d71d2f960d8ad8370 Mon Sep 17 00:00:00 2001
From: jwobith <james@wobith.org>
Date: Wed, 8 Apr 2020 02:03:28 -0400
Subject: [PATCH] fix merge issues

---
 README.md | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/README.md b/README.md
index e9212a6..4f28085 100644
--- a/README.md
+++ b/README.md
@@ -1,11 +1,5 @@
 docker-gitea
 ============
-<<<<<<< HEAD
-
-Docker Gitea Service
---------------------
-=======
->>>>>>> development
 
 Docker Gitea Service
 --------------------