From a1df332ec8f33fc5b49df7d0f65b1d30b3a07627 Mon Sep 17 00:00:00 2001
From: Con Kolivas <kernel@kolivas.org>
Date: Fri, 20 Nov 2015 14:17:34 +1100
Subject: [PATCH] MergeFix

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

diff --git a/src/generator.c b/src/generator.c
index 5304d247..24d5493d 100644
--- a/src/generator.c
+++ b/src/generator.c
@@ -1978,8 +1978,8 @@ static void *proxy_recv(void *arg)
 	alive = proxi->alive;
 
 	while (42) {
-		share_msg_t *share, *tmpshare;
 		notify_instance_t *ni, *tmp;
+		share_msg_t *share, *tmpshare;
 		float timeout;
 		time_t now;
 		int ret;