Conflict: File modified in both source and destination
To be able to merge you will need to resolve the conflicts manually. Learn how.Conflict: File modified in both source and destination
To be able to merge you will need to resolve the conflicts manually. Learn how.{EVM_RESTART_WINS, EVT_RESTART_WINS, RCN_RESTART_WINS, EVM_RESTART_DHCPD|EVM_RESTART_NMBD|EVM_REAPPLY_VPNSVR},
snprintf(filename, sizeof(filename), "%s/%s", STORAGE_CRONTAB_DIR, nvram_safe_get("http_username"));
+ sed -i 's/^\(logfile.*\)/#\1/;s/^logdir.*/logdir \/tmp/;s/^confdir.*/confdir \/etc\/storage\/privoxy/;s/^#trustfile.*/#trustfile user.trust/;s/^enable-edit-actions.*/enable-edit-actions 1/' configs/config
+ echo -e "\n## Forward to TOR\n#forward-socks5t / 127.0.0.1:9050 .\n#forward-socks5t .onion 127.0.0.1:9050 .\n#forward 192.168.*.*/ .\n#forward 10.*.*.*/ .\n" >>configs/config
Conflict: File modified in both source and destination
To be able to merge you will need to resolve the conflicts manually. Learn how.电脑维护,系统安装,软 、硬件维修,电脑配件,零售业务,网站建设,路由器安装设置、 服务器维护,电脑、网络维护,智能手机刷机,安装WIFI 调试!郴州网站建设 小程序搭建 郴州电脑维修
咨询电话:18175576644 扫描二维码。关注公众号,小程序 享受星级服务 |
手机点击二维码关注 |
手机点击打开小程序 |