Merge remote-tracking branch 'origin/main' into preparation-HS23 · Pi4J/pi4j-example-components@dd02346 · GitHub

Commit

Merge remote-tracking branch 'origin/main' into preparation-HS23

Browse files

# Conflicts:
#	pom.xml
#	src/main/java/com/pi4j/catalog/Launcher.java
#	src/main/java/com/pi4j/catalog/applications/Ads1115_App.java

Loading branch information

DieterHolz committed Oct 23, 2023

2 parents 1de5964 + 75c1045 commit dd02346