From 2b452af4b32c8f7b66c9dd421ba25e15bcdfaa43 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=AE=B5=E5=86=AC=E6=A2=85?= <duandongmei@zdjizhi.com>
Date: Mon, 25 Feb 2019 09:45:12 +0800
Subject: [PATCH] =?UTF-8?q?=E5=86=B2=E7=AA=81=E8=A7=A3=E5=86=B3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/resources/nis.properties | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/src/main/resources/nis.properties b/src/main/resources/nis.properties
index 79a4d1813..4257d28f5 100644
--- 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单位切换统计，导出图片增加标题与时间