Initial commit

2026-04-09 13:24:44 +03:00
parent 6328aea2f5
commit 522946453b
2 changed files with 7 additions and 0 deletions
--- a/src/device.c
+++ b/src/device.c
@@ -730,7 +730,11 @@ device_public_context_t* init(device_specs_t* specs, char* errbuf)

 uint8_t pubDeviceType() 
 {
+<<<<<<< HEAD
    return DEVICE_TYPE;
+=======
+    return EXTENDED_DEVICE_TYPE_DUMMY;
+>>>>>>> 1f4cc4d (Initial commit)
 }