resolve conflict

CHANGELOG.md

@@ -22,6 +22,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 - change svc alive from a thread to a function called every 30 sec from main
 - shut down tasks properly
 - fix memory leaks
+- Fixed memory leak in upstream event message flow
 
 ## [1.0.1] - 2018-07-18
 ### Added

src/upstream.c

@@ -308,7 +308,7 @@ void *processUpstreamMessage()
                 {
                     ParodusInfo(" Received upstream event data: dest '%s'\n", msg->u.event.dest);
                     partners_t *partnersList = NULL;
-		    int j = 0;
+                    int j = 0;
 
                     int ret = validate_partner_id(msg, &partnersList);
                     if(ret == 1)
@@ -337,7 +337,7 @@ void *processUpstreamMessage()
                     {
                         sendUpstreamMsgToServer(&message->msg, message->len);
                     }
-		    if(partnersList != NULL)
+                    if(partnersList != NULL)
                     {
                         for(j=0; j<(int)partnersList->count; j++)
                         {