From 4b06772c554651cdc29427ffd9271cc608d95189 Mon Sep 17 00:00:00 2001
From: David Wehr <dawehr@iastate.edu>
Date: Mon, 27 Mar 2017 08:53:22 -0500
Subject: [PATCH] Fixed mistake with merge.

---
 quad/src/quad_app/callbacks.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/quad/src/quad_app/callbacks.c b/quad/src/quad_app/callbacks.c
index 5ae92668d..c892167da 100644
--- a/quad/src/quad_app/callbacks.c
+++ b/quad/src/quad_app/callbacks.c
@@ -44,7 +44,7 @@ int cb_packetlog(modular_structs_t* structs, struct metadata *meta, u8 *data, u1
   * Handles a get packet logs request and sends a response
   * with the packet log data.
   */
-int cb_getpacketlogs(modular_structs_t* structs, metadata_t *meta, u8 *data, u16 length) {
+int cb_getpacketlogs(modular_structs_t* structs, struct metadata *meta, u8 *data, u16 length) {
 	u8 buf[255];
 
 	// Message logging number of messages received and size of payload received
-- 
GitLab