冲突解决

2019-02-25 09:45:12 +08:00
parent c5aae2302c
commit 2b452af4b3
1 changed files with 1 additions and 5 deletions
--- a/src/main/resources/nis.properties
+++ b/src/main/resources/nis.properties
@@ -1242,9 +1242,5 @@ addRegionToCommonGroup=v1/addRegionToCommonGroup
 updateRegionToCommonGroup=v1/updateCommonGroupRegion
 deleteRegionToCommonGroup=v1/delCommonGroupRegion
 #\u6d41\u91cf\u7edf\u8ba1app\u8be6\u60c5\u8d8b\u52bf\u56feGbps.pps\u63a5\u53e3
-trafficAppPpsTrend=v1/trafficAppPpsTrend
-<<<<<<< develop_no_common_group
-trafficAppBpsTrend=v1/trafficAppBpsTrend
-=======
+trafficAppPpsTrend=v1/trafficAppPpsTrend
 trafficAppBpsTrend=v1/trafficAppBpsTrend
->>>>>>> 961cd7d 流量统计app详情趋势统计图增加Gbps、PPS单位切换统计，导出图片增加标题与时间