Resolving merge conflicts

Hyp-ed · Nov 16, 2024 · 1aa8f9e · 1aa8f9e
1 parent 7d31131
commit 1aa8f9e
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/lib/sensors/src/lib.rs b/lib/sensors/src/lib.rs
@@ -2,4 +2,4 @@
 
 pub mod keyence;
 pub mod led_driver;
-pub mod temperature;
+pub mod temperature;