mirror of
https://github.com/matrix-org/dendrite
synced 2024-11-10 07:04:24 +00:00
Fix dockerfile
This commit is contained in:
parent
5caae6f3a0
commit
0352f250b8
1 changed files with 0 additions and 4 deletions
|
@ -1,8 +1,4 @@
|
|||
<<<<<<< HEAD
|
||||
FROM docker.io/golang:1.13.7-alpine3.11
|
||||
=======
|
||||
FROM docker.io/golang:1.13.6-alpine
|
||||
>>>>>>> master
|
||||
|
||||
RUN mkdir /build
|
||||
|
||||
|
|
Loading…
Reference in a new issue