From 748db590d798d9f7a78159dfa64f6940c1bd6674 Mon Sep 17 00:00:00 2001
From: Robert Johansson <rob@raditex.nu>
Date: Fri, 13 Apr 2012 11:00:10 +0900
Subject: [PATCH] resolved conflict

---
 .../bin/mbus-tcp-request-data-multi-reply.c   | 19 -------------------
 libmbus/mbus/mbus-protocol.h                  |  2 +-
 2 files changed, 1 insertion(+), 20 deletions(-)

diff --git a/libmbus/bin/mbus-tcp-request-data-multi-reply.c b/libmbus/bin/mbus-tcp-request-data-multi-reply.c
index 9ca9afa..bdbc0cc 100644
--- a/libmbus/bin/mbus-tcp-request-data-multi-reply.c
+++ b/libmbus/bin/mbus-tcp-request-data-multi-reply.c
@@ -94,29 +94,10 @@ main(int argc, char **argv)
         // primary addressing
         address = atoi(addr_str);
     }   
-
-    /*
-    if (mbus_send_request_frame(handle, address) == -1)
-    {
-        fprintf(stderr, "Failed to send M-Bus request frame.\n");
-        return 1;
-    }
-
-    if (mbus_recv_frame(handle, &reply) == -1)
-    {
-        fprintf(stderr, "Failed to receive M-Bus response frame.\n");
-        return 1;
-    }    
-    */
     
     // instead of the send and recv, use this sendrecv function that 
-<<<<<<< HEAD
-    // takes care of the possibility of multi-telegram replies
-    if (mbus_sendrecv_request(handle, address, &reply) == -1)
-=======
     // takes care of the possibility of multi-telegram replies (limit = 16 frames)
     if (mbus_sendrecv_request(handle, address, &reply, 16) == -1)
->>>>>>> 58c2bbe2338cc1c5e30fa4cb1d52f5cb56ae9801
     {
         fprintf(stderr, "Failed to send/receive M-Bus request.\n");
         return 1;
diff --git a/libmbus/mbus/mbus-protocol.h b/libmbus/mbus/mbus-protocol.h
index 9398ca0..47612fc 100644
--- a/libmbus/mbus/mbus-protocol.h
+++ b/libmbus/mbus/mbus-protocol.h
@@ -171,7 +171,7 @@ typedef struct _mbus_data_variable {
   
     mbus_data_variable_header header;
     
-    mbus_data_record *record; // XXX: this max num must be dynamic
+    mbus_data_record *record; 
     size_t nrecords;
     
     u_char *data;