Merge remote-tracking branch 'origin/develop' into develop

# Conflicts: # src/main/java/org/tron/core/services/WitnessService.java # src/main/protos/core/Contract.proto
tronprotocol · Apr 2, 2018 · 59a3f02 · 59a3f02
2 parents ac5eed9 + b1f5964
commit 59a3f02
Showing 1 changed file with 1 addition and 0 deletions.
diff --git a/core/Tron.proto b/core/Tron.proto
@@ -195,6 +195,7 @@ enum ReasonCode {
   LOCAL_IDENTITY = 10;
   PING_TIMEOUT = 11;
   USER_REASON = 12;
+  RESET = 16;
   UNKNOWN = 255;
 }