ykxiao/laradock
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Conflict merge

Browse Source
This commit is contained in:
Madson Jr
2018-07-18 13:26:27 -03:00
parent 238a78aafc
commit 7aba9991f6
4 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
workspace/Dockerfile
View File

@ -787,7 +787,7 @@ RUN if [ ${INSTALL_PG_CLIENT} = true ]; then \
USER root
RUN apt-get update -yqq \
&& apt-get -yqq install nasm
&& apt-get -yqq install nasm
###########################################################################
# Dusk Dependencies: