Revert "冲突"

This reverts commit 8d9bbabbee.
This commit is contained in:
zhanghongqing
2018-08-20 17:46:28 +08:00
parent 8d9bbabbee
commit ada7d38be9
2 changed files with 6 additions and 9 deletions

View File

@@ -1076,8 +1076,6 @@ ip_intercepter_replace=IP Intercept Replace
domain_intercepter_replace=Domain Intercept Replace
ip_intercepter_ratelimit=IP Intercept Ratelimit
domain_intercepter_ratelimit=Domain Intercept Ratelimit
app_built_in_features_config=APP Built-in Features
app_ssl_config=APP SSL Cert Feature
PXY_INTERCEPT_PKT_BIN=Intercept Messages
certificate=Certificate
app_ssl_config=APP SSL Cert Feature
app_built_in_features_config=APP Built-in Features
app_ssl_config=APP SSL Cert Feature
p2p_control=P2P