From a8468064d685dc99f34fc99de95cc1bed4a1cc71 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=AE=B5=E5=86=AC=E6=A2=85?= <duandongmei@zdjizhi.com>
Date: Fri, 22 Feb 2019 18:31:12 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=B8=A4=E4=B8=AA=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=20trafficAppBpsTrend=20trafficAppPpsTrend?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/src/main/resources/nis.properties b/src/main/resources/nis.properties
index 856343ee8..0b0aa278e 100644
--- a/src/main/resources/nis.properties
+++ b/src/main/resources/nis.properties
@@ -1,4 +1,3 @@
-<<<<<<< develop_no_common_group
 #\u7ba1\u7406\u57fa\u7840\u8def\u5f84, \u9700\u540c\u6b65\u4fee\u6539\uff1aweb.xml
 adminPath=/nis
 
@@ -1244,5 +1243,4 @@ updateRegionToCommonGroup=v1/updateCommonGroupRegion
 deleteRegionToCommonGroup=v1/delCommonGroupRegion
 #\u6d41\u91cf\u7edf\u8ba1app\u8be6\u60c5\u8d8b\u52bf\u56feGbps.pps\u63a5\u53e3
 trafficAppPpsTrend=v1/trafficAppPpsTrend
-trafficAppBpsTrend=v1/trafficAppBpsTrend
->>>>>>> 2dd73ad 流量统计app详情趋势统计图增加Gbps、PPS单位切换统计，导出图片增加标题与时间
+trafficAppBpsTrend=v1/trafficAppBpsTrend