add instr, manifest, dev_variant
This commit is contained in:
@@ -730,11 +730,7 @@ 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)
|
||||
}
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user