fix conflict

tronprotocol · Sep 12, 2018 · 5c29de8 · 5c29de8
1 parent 8e24227
commit 5c29de8
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/core/Tron.proto b/core/Tron.proto
@@ -128,9 +128,9 @@ message Account {
     int64 latest_consume_time_for_energy = 3;
 
     //Frozen balance provided by other accounts to this account
-    int64 acquired_delegated_frozen_balance_for_cpu = 4;
+    int64 acquired_delegated_frozen_balance_for_energy = 4;
     //Frozen balances provided to other accounts
-    int64 delegated_frozen_balance_for_cpu = 5;
+    int64 delegated_frozen_balance_for_energy = 5;
 
     // storage resource, get from market
     int64 storage_limit = 6;
@@ -148,7 +148,7 @@ message  DelegatedResource{
   bytes from = 1;
   bytes to = 2;
   int64 frozen_balance_for_bandwidth = 3;
-  int64 frozen_balance_for_cpu = 4;
+  int64 frozen_balance_for_energy = 4;
   int64 expire_time = 5;
 }