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

# Conflicts: # src/main/java/org/tron/core/capsule/utils/BlockUtil.java # src/main/java/org/tron/core/config/args/LocalWitnesses.java # src/main/java/org/tron/core/db/Manager.java # src/test/java/org/tron/core/db/ManagerTest.java
tronprotocol · Mar 16, 2018 · a3c7257 · a3c7257
2 parents a58bf8e + fee98bf
commit a3c7257
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/core/Tron.proto b/core/Tron.proto
@@ -27,7 +27,7 @@ message Account {
   int64 balance = 4;
   repeated Vote votes = 5;
   map<string, int64> asset = 6;
-
+  int64 latest_opration_time = 10;
 }
 
 // Witness