Fix merge conflict.

This commit is contained in:
Jean-François Milants 2021-02-14 14:19:30 +01:00
commit 5fdfb2112e
10 changed files with 80 additions and 7 deletions

View file

@ -21,6 +21,7 @@ RUN apt-get update -qq \
&& rm -rf /var/cache/apt/* /var/lib/apt/lists/*;
RUN pip3 install adafruit-nrfutil
RUN pip3 install -Iv cryptography==3.3
# build.sh knows how to compile
COPY build.sh /opt/