merged telemetry.pb.h

meshtastic · May 31, 2024 · 1babf60 · 1babf60
1 parent aa2f380
commit 1babf60
Showing 1 changed file with 1 addition and 5 deletions.
diff --git a/src/mesh/generated/meshtastic/telemetry.pb.h b/src/mesh/generated/meshtastic/telemetry.pb.h
@@ -58,11 +58,7 @@ typedef enum _meshtastic_TelemetrySensorType {
     meshtastic_TelemetrySensorType_LTR390UV = 21,
     /* AMS TSL25911FN RGB Light Sensor */
     meshtastic_TelemetrySensorType_TSL25911FN = 22,
-<<<<<<< trackerd
     /* AHT10/20 Temperature Sensor */
-=======
-    /* AHT10 Integrated temperature and humidity sensor */
->>>>>>> master
     meshtastic_TelemetrySensorType_AHT10 = 23
 } meshtastic_TelemetrySensorType;
 
@@ -323,4 +319,4 @@ extern const pb_msgdesc_t meshtastic_Telemetry_msg;
 } /* extern "C" */
 #endif
 
-#endif
+#endif