|
@@ -9,7 +9,7 @@ |
|
|
block discarded – undo |
|
9
|
9
|
$merged_reality = get_reality($merged_vless); |
|
10
|
10
|
$merged_trojan = array_to_subscription($merged_data['trojan']); |
|
11
|
11
|
$merged_shadowsocks = array_to_subscription($merged_data['ss']); |
|
12
|
|
-$merged_mix = $merged_vmess . $merged_vless . $merged_trojan . $merged_shadowsocks ; |
|
|
12
|
+$merged_mix = $merged_vmess . $merged_vless . $merged_trojan . $merged_shadowsocks; |
|
13
|
13
|
|
|
14
|
14
|
file_put_contents("merged", $merged_mix); |
|
15
|
15
|
file_put_contents("merged_base64", base64_encode($merged_mix)); |
Please login to merge, or discard this patch.