Update Knob_Basic.ino

dido18 · web-flow · commit f4a43f5510d5 · 2025-06-17T16:31:32.000+02:00
diff --git a/examples/Modulino_Knob/Knob_Basic/Knob_Basic.ino b/examples/Modulino_Knob/Knob_Basic/Knob_Basic.ino
@@ -34,9 +34,6 @@ void loop(){
     Serial.println("Clicked!");
   }
 
-<<<<<<< patch-1
-}
-=======
   if (direction == 1) {
     Serial.println("Rotated clockwise");
   } else if (direction == -1) {
@@ -45,4 +42,3 @@ void loop(){
 
   delay(10); // optional small delay to reduce serial spam
 } 
->>>>>>> main

Original file line number	Diff line number	Diff line change
`@@ -34,9 +34,6 @@ void loop(){`
`34`	`34`	`Serial.println("Clicked!");`
`35`	`35`	`}`
`36`	`36`
`37`		`-<<<<<<< patch-1`
`38`		`-}`
`39`		`-=======`
`40`	`37`	`if (direction == 1) {`
`41`	`38`	`Serial.println("Rotated clockwise");`
`42`	`39`	`} else if (direction == -1) {`
`@@ -45,4 +42,3 @@ void loop(){`
`45`	`42`
`46`	`43`	`delay(10); // optional small delay to reduce serial spam`
`47`	`44`	`}`
`48`		`->>>>>>> main`