fix conflict

Pandulis · Jul 23, 2020 · 27d2dc4 · 27d2dc4
1 parent 88f9276
commit 27d2dc4
Showing 1 changed file with 12 additions and 11 deletions.
diff --git a/framework/src/main/java/org/tron/core/services/RpcApiService.java b/framework/src/main/java/org/tron/core/services/RpcApiService.java
@@ -2560,17 +2560,6 @@ public void getTransactionInfoByBlockNum(NumberMessage request,
 
       responseObserver.onCompleted();
     }
-  }
-
-  public class MonitorApi extends MonitorGrpc.MonitorImplBase {
-
-    @Override
-    public void getStatsInfo(EmptyMessage request,
-        StreamObserver<Protocol.MetricsInfo> responseObserver) {
-      responseObserver.onNext(metricsApiService.getMetricProtoInfo());
-      responseObserver.onCompleted();
-    }
-
 
     @Override
     public void marketSellAsset(MarketSellAssetContract request,
@@ -2655,4 +2644,16 @@ public void getMarketPairList(EmptyMessage request,
       responseObserver.onCompleted();
     }
   }
+
+  public class MonitorApi extends MonitorGrpc.MonitorImplBase {
+
+    @Override
+    public void getStatsInfo(EmptyMessage request,
+        StreamObserver<Protocol.MetricsInfo> responseObserver) {
+      responseObserver.onNext(metricsApiService.getMetricProtoInfo());
+      responseObserver.onCompleted();
+    }
+
+
+  }
 }