From 8e8b9394bc3a1a01aed956b08c846c1f4a1a8b71 Mon Sep 17 00:00:00 2001
From: Grover-c13 <Grover.c13@gmail.com>
Date: Mon, 1 Aug 2016 20:39:21 +0800
Subject: [PATCH] fix merge issue

---
 src/resources/protobuf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/resources/protobuf b/src/resources/protobuf
index 8e0fac2d..333e5470 160000
--- a/src/resources/protobuf
+++ b/src/resources/protobuf
@@ -1 +1 @@
-Subproject commit 8e0fac2d685fbc635886e9091039b245bb86511c
+Subproject commit 333e54707ca221324c6b9eedb6a7bc2fcae02270