fix merge issue

Grover-c13 · Grover-c13 · commit 8e8b9394bc3a · 2016-08-01T20:39:21.000+08:00
diff --git a/src/resources/protobuf b/src/resources/protobuf
@@ -1 +1 @@
-Subproject commit 8e0fac2d685fbc635886e9091039b245bb86511c
+Subproject commit 333e54707ca221324c6b9eedb6a7bc2fcae02270
