fix merge issues

This commit is contained in:
jwobith
2020-04-08 02:03:28 -04:00
parent bc1b9ca380
commit 799c942200

View File

@ -1,11 +1,5 @@
docker-gitea docker-gitea
============ ============
<<<<<<< HEAD
Docker Gitea Service
--------------------
=======
>>>>>>> development
Docker Gitea Service Docker Gitea Service
-------------------- --------------------