still trying to deal with the merge errors

pioneers · Nov 8, 2014 · f3d6c08 · f3d6c08
1 parent 6e05f6e
commit f3d6c08
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/angel-player/src/chrome/content/common_defs/radio_protocol_ng.yaml b/angel-player/src/chrome/content/common_defs/radio_protocol_ng.yaml
@@ -170,6 +170,8 @@
       type: device_read_descriptor_resp_t
     - name: device_blink
       type: device_blink_t
+    - name: nothing
+      type: uint8_t
 
 - name: config_port
   kind: struct