File tree 1 file changed +7
-0
lines changed
1 file changed +7
-0
lines changed Original file line number Diff line number Diff line change @@ -161,10 +161,17 @@ function install_ide()
161
161
# Acquire needed packages from Windows package manager
162
162
choco install --no-progress python3
163
163
export PATH=" /c/Python37:$PATH " # Ensure it's live from now on...
164
+ <<< <<< < HEAD
164
165
cp /c/Python37/python.exe /c/Python37/python3.exe
165
166
choco install --no-progress unzip
166
167
choco install --no-progress sed
167
168
# choco install --no-progress golang
169
+ =======
170
+ cp /c/Python37/python.exe /c/Python37/python3.exe
171
+ choco install --no-progress unzip
172
+ choco install --no-progress sed
173
+ choco install --no-progress golang
174
+ >>>>>>> edfc77b0c247efe7afa70461ff9c32fda27c3274
168
175
test -r arduino-nightly-windows.zip || wget -nv -O arduino-nightly-windows.zip https://www.arduino.cc/download.php? f=/arduino-nightly-windows.zip
169
176
unzip -q arduino-nightly-windows.zip
170
177
elif [ " $MACOSX " = " 1" ]; then
You can’t perform that action at this time.
0 commit comments