Fix merge conflict.
This commit is contained in:
commit
5fdfb2112e
10 changed files with 80 additions and 7 deletions
|
|
@ -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/
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue