missed change due to conflict

mbientlab · Jan 26, 2023 · b20fdd5 · b20fdd5
1 parent bc26090
commit b20fdd5
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/library/src/main/java/com/mbientlab/metawear/impl/Constant.java b/library/src/main/java/com/mbientlab/metawear/impl/Constant.java
@@ -48,7 +48,7 @@ enum Module {
         TIMER(0x0c, "Timer"),
         SERIAL_PASSTHROUGH(0x0d, "SerialPassthrough"),
         MACRO(0x0f, "Macro"),
-        // Deprecated  GSR(0x10, "Conductance"),
+        GSR(0x10, "Conductance"),
         SETTINGS(0x11, "Settings"),
         BAROMETER(0x12, "Barometer"),
         GYRO(0x13, "Gyro"),