modified: Dockerfile

Removed indication of conflict with upstram

Author: jorgejesus

docker/alpine/flask/Dockerfile

@@ -1,10 +1,8 @@
 FROM alpine:3.6
 MAINTAINER Jorge S. Mendes de Jesus <[email protected]>
 
-
 ARG GDAL_VERSION=2.3.2
 ARG XERCES_VERSION=3.2.2
->>>>>>> upstream/master
 ARG PROCESSOR_N=4
 
 RUN apk update && apk add --no-cache \