Merge cleanup

2021-04-26 01:36:07 +02:00 · 2021-04-26 01:36:07 +02:00 · 0b3adb119e
parent f79ed8fafa
commit 0b3adb119e
1 changed files with 0 additions and 1 deletions
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@ -1,4 +1,3 @@
-<<<<<<< HEAD
 FROM jlesage/baseimage-gui:debian-10

 ENV APP_NAME="Gnutella"