From 0b3adb119ed01cd0ddfd2fe760646bc195b8f975 Mon Sep 17 00:00:00 2001
From: James May <jamesmay@eris.cc>
Date: Mon, 26 Apr 2021 01:36:07 +0200
Subject: [PATCH] Merge cleanup

---
 docker/Dockerfile | 1 -
 1 file changed, 1 deletion(-)

diff --git a/docker/Dockerfile b/docker/Dockerfile
index 38e1a83..1ed60d6 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 FROM jlesage/baseimage-gui:debian-10
 
 ENV APP_NAME="Gnutella"