shadowsocks-libev: ss-rules: Add 'auto-merge' flag to avoid conflicts
authorLi Xin <i@crzidea.com>
Thu, 10 Nov 2022 04:10:05 +0000 (12:10 +0800)
committerYousong Zhou <yszhou4tech@gmail.com>
Thu, 4 May 2023 10:02:23 +0000 (18:02 +0800)
commitaa68fc4cb350fc4046748ed6a8f400b4a22f8259
tree72c8d906115d37d0325189cb0835553e36251f07
parent7398724ec5e1824fb418dc25d6d48c88f9533654
shadowsocks-libev: ss-rules: Add 'auto-merge' flag to avoid conflicts

Link: https://github.com/openwrt/packages/pull/19872
Signed-off-by: Li Xin <i@crzidea.com>
(squash commits)
Signed-off-by: Yousong Zhou <yszhou4tech@gmail.com>
(cherry picked from commit 8966f49f9a715e07527580c50ac29ae560447670)
net/shadowsocks-libev/Makefile
net/shadowsocks-libev/files/ss-rules/set.uc