resolve confilct

Browse Source

...

This commit is contained in:

CN_SZTL 2019-07-06 23:12:15 +08:00

parent 60f2107bfa

commit eed53a3cdb

No known key found for this signature in database

GPG Key ID: 6850B6345C862176

47 changed files with 0 additions and 0 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0

package/lean/luci-app-ssr-plus/Makefile → package/jsda/luci-app-ssr-plus-jsda/Makefile

Unescape Escape View File

0

package/lean/luci-app-ssr-plus/luasrc/controller/shadowsocksr.lua → package/jsda/luci-app-ssr-plus-jsda/luasrc/controller/shadowsocksr.lua

Unescape Escape View File

0

package/lean/luci-app-ssr-plus/luasrc/model/cbi/shadowsocksr/advanced.lua → package/jsda/luci-app-ssr-plus-jsda/luasrc/model/cbi/shadowsocksr/advanced.lua

Unescape Escape View File

0

package/lean/luci-app-ssr-plus/luasrc/model/cbi/shadowsocksr/client-config.lua → package/jsda/luci-app-ssr-plus-jsda/luasrc/model/cbi/shadowsocksr/client-config.lua

Unescape Escape View File

0

package/lean/luci-app-ssr-plus/luasrc/model/cbi/shadowsocksr/client.lua → package/jsda/luci-app-ssr-plus-jsda/luasrc/model/cbi/shadowsocksr/client.lua

Unescape Escape View File

0

package/lean/luci-app-ssr-plus/luasrc/model/cbi/shadowsocksr/control.lua → package/jsda/luci-app-ssr-plus-jsda/luasrc/model/cbi/shadowsocksr/control.lua

Unescape Escape View File

0

package/lean/luci-app-ssr-plus/luasrc/model/cbi/shadowsocksr/list.lua → package/jsda/luci-app-ssr-plus-jsda/luasrc/model/cbi/shadowsocksr/list.lua

Unescape Escape View File

0

package/lean/luci-app-ssr-plus/luasrc/model/cbi/shadowsocksr/log.lua → package/jsda/luci-app-ssr-plus-jsda/luasrc/model/cbi/shadowsocksr/log.lua

Unescape Escape View File

0

package/lean/luci-app-ssr-plus/luasrc/model/cbi/shadowsocksr/oversealist.lua → package/jsda/luci-app-ssr-plus-jsda/luasrc/model/cbi/shadowsocksr/oversealist.lua

Unescape Escape View File

0

package/lean/luci-app-ssr-plus/luasrc/model/cbi/shadowsocksr/server-config.lua → package/jsda/luci-app-ssr-plus-jsda/luasrc/model/cbi/shadowsocksr/server-config.lua

Unescape Escape View File

0

package/lean/luci-app-ssr-plus/luasrc/model/cbi/shadowsocksr/server.lua → package/jsda/luci-app-ssr-plus-jsda/luasrc/model/cbi/shadowsocksr/server.lua

Unescape Escape View File

0

package/lean/luci-app-ssr-plus/luasrc/model/cbi/shadowsocksr/servers.lua → package/jsda/luci-app-ssr-plus-jsda/luasrc/model/cbi/shadowsocksr/servers.lua

Unescape Escape View File

0

package/lean/luci-app-ssr-plus/luasrc/model/cbi/shadowsocksr/status.lua → package/jsda/luci-app-ssr-plus-jsda/luasrc/model/cbi/shadowsocksr/status.lua

Unescape Escape View File

0

package/lean/luci-app-ssr-plus/luasrc/view/cbi/ssr_other_upload.htm → package/jsda/luci-app-ssr-plus-jsda/luasrc/view/cbi/ssr_other_upload.htm

Unescape Escape View File

0

package/lean/luci-app-ssr-plus/luasrc/view/cbi/ssr_other_upload2.htm → package/jsda/luci-app-ssr-plus-jsda/luasrc/view/cbi/ssr_other_upload2.htm

Unescape Escape View File

0

package/lean/luci-app-ssr-plus/luasrc/view/shadowsocksr/check.htm → package/jsda/luci-app-ssr-plus-jsda/luasrc/view/shadowsocksr/check.htm

Unescape Escape View File

0

package/lean/luci-app-ssr-plus/luasrc/view/shadowsocksr/checkport.htm → package/jsda/luci-app-ssr-plus-jsda/luasrc/view/shadowsocksr/checkport.htm

Unescape Escape View File

0

package/lean/luci-app-ssr-plus/luasrc/view/shadowsocksr/ping.htm → package/jsda/luci-app-ssr-plus-jsda/luasrc/view/shadowsocksr/ping.htm

Unescape Escape View File

0

package/lean/luci-app-ssr-plus/luasrc/view/shadowsocksr/refresh.htm → package/jsda/luci-app-ssr-plus-jsda/luasrc/view/shadowsocksr/refresh.htm

Unescape Escape View File

0

package/lean/luci-app-ssr-plus/luasrc/view/shadowsocksr/server_list.htm → package/jsda/luci-app-ssr-plus-jsda/luasrc/view/shadowsocksr/server_list.htm

Unescape Escape View File

0

package/lean/luci-app-ssr-plus/luasrc/view/shadowsocksr/ssrurl.htm → package/jsda/luci-app-ssr-plus-jsda/luasrc/view/shadowsocksr/ssrurl.htm

Unescape Escape View File

0

package/lean/luci-app-ssr-plus/luasrc/view/shadowsocksr/status.htm → package/jsda/luci-app-ssr-plus-jsda/luasrc/view/shadowsocksr/status.htm

Unescape Escape View File

0

package/lean/luci-app-ssr-plus/po/zh-cn/ssr-plus.zh-cn.lmo → package/jsda/luci-app-ssr-plus-jsda/po/zh-cn/ssr-plus.zh-cn.lmo

Unescape Escape View File

0

package/lean/luci-app-ssr-plus/root/etc/china_ssr.txt → package/jsda/luci-app-ssr-plus-jsda/root/etc/china_ssr.txt

Unescape Escape View File

0

package/lean/luci-app-ssr-plus/root/etc/config/gfw.list → package/jsda/luci-app-ssr-plus-jsda/root/etc/config/gfw.list

Unescape Escape View File

0

package/lean/luci-app-ssr-plus/root/etc/config/shadowsocksr → package/jsda/luci-app-ssr-plus-jsda/root/etc/config/shadowsocksr

Unescape Escape View File

0

package/lean/luci-app-ssr-plus/root/etc/dnsmasq.oversea/base_list.conf → package/jsda/luci-app-ssr-plus-jsda/root/etc/dnsmasq.oversea/base_list.conf

Unescape Escape View File

0

package/lean/luci-app-ssr-plus/root/etc/dnsmasq.oversea/oversea_list.conf → package/jsda/luci-app-ssr-plus-jsda/root/etc/dnsmasq.oversea/oversea_list.conf

Unescape Escape View File

0

package/lean/luci-app-ssr-plus/root/etc/dnsmasq.ssr/gfw_base.conf → package/jsda/luci-app-ssr-plus-jsda/root/etc/dnsmasq.ssr/gfw_base.conf

Unescape Escape View File

0

package/lean/luci-app-ssr-plus/root/etc/dnsmasq.ssr/gfw_list.conf → package/jsda/luci-app-ssr-plus-jsda/root/etc/dnsmasq.ssr/gfw_list.conf

Unescape Escape View File

0

package/lean/luci-app-ssr-plus/root/etc/hotplug.d/iface/98-shadowsocksr → package/jsda/luci-app-ssr-plus-jsda/root/etc/hotplug.d/iface/98-shadowsocksr

Unescape Escape View File

0

package/lean/luci-app-ssr-plus/root/etc/init.d/shadowsocksr → package/jsda/luci-app-ssr-plus-jsda/root/etc/init.d/shadowsocksr

Unescape Escape View File

0

package/lean/luci-app-ssr-plus/root/etc/uci-defaults/luci-ssr-plus → package/jsda/luci-app-ssr-plus-jsda/root/etc/uci-defaults/luci-ssr-plus

Unescape Escape View File

0

package/lean/luci-app-ssr-plus/root/usr/bin/ssr-ad → package/jsda/luci-app-ssr-plus-jsda/root/usr/bin/ssr-ad

Unescape Escape View File

0

package/lean/luci-app-ssr-plus/root/usr/bin/ssr-gfw → package/jsda/luci-app-ssr-plus-jsda/root/usr/bin/ssr-gfw

Unescape Escape View File

0

package/lean/luci-app-ssr-plus/root/usr/bin/ssr-monitor → package/jsda/luci-app-ssr-plus-jsda/root/usr/bin/ssr-monitor

Unescape Escape View File

0

package/lean/luci-app-ssr-plus/root/usr/bin/ssr-rules → package/jsda/luci-app-ssr-plus-jsda/root/usr/bin/ssr-rules

Unescape Escape View File

0

package/lean/luci-app-ssr-plus/root/usr/bin/ssr-switch → package/jsda/luci-app-ssr-plus-jsda/root/usr/bin/ssr-switch

Unescape Escape View File

0

package/lean/luci-app-ssr-plus/root/usr/share/shadowsocksr/chinaipset.sh → package/jsda/luci-app-ssr-plus-jsda/root/usr/share/shadowsocksr/chinaipset.sh

Unescape Escape View File

0

package/lean/luci-app-ssr-plus/root/usr/share/shadowsocksr/genv2config.lua → package/jsda/luci-app-ssr-plus-jsda/root/usr/share/shadowsocksr/genv2config.lua

Unescape Escape View File

0

package/lean/luci-app-ssr-plus/root/usr/share/shadowsocksr/genv2config_haproxy.lua → package/jsda/luci-app-ssr-plus-jsda/root/usr/share/shadowsocksr/genv2config_haproxy.lua

Unescape Escape View File

0

package/lean/luci-app-ssr-plus/root/usr/share/shadowsocksr/genv2config_local.lua → package/jsda/luci-app-ssr-plus-jsda/root/usr/share/shadowsocksr/genv2config_local.lua

Unescape Escape View File

0

package/lean/luci-app-ssr-plus/root/usr/share/shadowsocksr/genv2config_server.lua → package/jsda/luci-app-ssr-plus-jsda/root/usr/share/shadowsocksr/genv2config_server.lua

Unescape Escape View File

0

package/lean/luci-app-ssr-plus/root/usr/share/shadowsocksr/gfw2ipset.sh → package/jsda/luci-app-ssr-plus-jsda/root/usr/share/shadowsocksr/gfw2ipset.sh

Unescape Escape View File

0

package/lean/luci-app-ssr-plus/root/usr/share/shadowsocksr/subscribe.sh → package/jsda/luci-app-ssr-plus-jsda/root/usr/share/shadowsocksr/subscribe.sh

Unescape Escape View File

0

package/lean/luci-app-ssr-plus/root/usr/share/shadowsocksr/update.sh → package/jsda/luci-app-ssr-plus-jsda/root/usr/share/shadowsocksr/update.sh

Unescape Escape View File

0

package/lean/luci-app-ssr-plus/root/usr/share/shadowsocksr/v2ray_update.sh → package/jsda/luci-app-ssr-plus-jsda/root/usr/share/shadowsocksr/v2ray_update.sh

Unescape Escape View File