Merge cleanup
This commit is contained in:
parent
f79ed8fafa
commit
0b3adb119e
|
@ -1,4 +1,3 @@
|
||||||
<<<<<<< HEAD
|
|
||||||
FROM jlesage/baseimage-gui:debian-10
|
FROM jlesage/baseimage-gui:debian-10
|
||||||
|
|
||||||
ENV APP_NAME="Gnutella"
|
ENV APP_NAME="Gnutella"
|
||||||
|
|
Loading…
Reference in a new issue