Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master' into aj/OSSM-48
Browse files Browse the repository at this point in the history
# Conflicts:
#	Software/platformio.ini
  • Loading branch information
AJ-Koenig committed Dec 9, 2023
2 parents 98354cd + ab043a1 commit 0c41532
Showing 1 changed file with 0 additions and 1 deletion.
1 change: 0 additions & 1 deletion Software/platformio.ini
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ build_flags =
-std=gnu++17

lib_deps =
https://github.com/theelims/StrokeEngine.git
thingpulse/ESP8266 and ESP32 OLED driver for SSD1306 displays@^4.4.0
https://github.com/tzapu/WiFiManager.git
gin66/FastAccelStepper@^0.30.8
Expand Down

0 comments on commit 0c41532

Please sign in to comment.