Skip to content
This repository has been archived by the owner on Nov 17, 2023. It is now read-only.

Commit

Permalink
merge the conflict
Browse files Browse the repository at this point in the history
  • Loading branch information
@stu1130
stu1130 committed May 16, 2019
1 parent ab5145a commit 87fe8b1
Show file tree
Hide file tree
Showing 3 changed files with 0 additions and 9 deletions.
3 changes: 0 additions & 3 deletions ci/docker/Dockerfile.build.ubuntu_gpu_cu100
View file
Original file line number Diff line number Diff line change
Expand Up @@ -77,12 +77,9 @@ ARG GROUP_ID=0
COPY install/ubuntu_adduser.sh /work/
RUN /work/ubuntu_adduser.sh

<<<<<<< HEAD
=======
ENV CUDNN_VERSION=7.5.1.10
COPY install/ubuntu_cudnn.sh /work/
RUN /work/ubuntu_cudnn.sh
>>>>>>> remove the duplicate one

COPY runtime_functions.sh /work/

Expand Down
3 changes: 0 additions & 3 deletions ci/docker/Dockerfile.build.ubuntu_gpu_cu90
View file
Original file line number Diff line number Diff line change
Expand Up @@ -77,13 +77,10 @@ ARG GROUP_ID=0
COPY install/ubuntu_adduser.sh /work/
RUN /work/ubuntu_adduser.sh

<<<<<<< HEAD
=======
ENV CUDNN_VERSION=7.5.1.10
COPY install/ubuntu_cudnn.sh /work/
RUN /work/ubuntu_cudnn.sh

>>>>>>> remove the duplicate one
COPY runtime_functions.sh /work/

WORKDIR /work/mxnet
Expand Down
3 changes: 0 additions & 3 deletions ci/docker/Dockerfile.build.ubuntu_gpu_cu92
View file
Original file line number Diff line number Diff line change
Expand Up @@ -76,13 +76,10 @@ ARG GROUP_ID=0
COPY install/ubuntu_adduser.sh /work/
RUN /work/ubuntu_adduser.sh

<<<<<<< HEAD
=======
ENV CUDNN_VERSION=7.5.1.10
COPY install/ubuntu_cudnn.sh /work/
RUN /work/ubuntu_cudnn.sh

>>>>>>> remove the duplicate one
COPY runtime_functions.sh /work/

WORKDIR /work/mxnet
Expand Down

0 comments on commit 87fe8b1

Please sign in to comment.