mirror of
https://github.com/v2fly/v2ray-core.git
synced 2025-01-17 14:57:44 -05:00
Merge pull request #299 from forever8938/master
Load JSON internally by default
This commit is contained in:
commit
0dc17643a0
@ -59,9 +59,9 @@ import (
|
|||||||
|
|
||||||
// JSON config support. Choose only one from the two below.
|
// JSON config support. Choose only one from the two below.
|
||||||
// The following line loads JSON from v2ctl
|
// The following line loads JSON from v2ctl
|
||||||
_ "v2ray.com/core/main/json"
|
// _ "v2ray.com/core/main/json"
|
||||||
// The following line loads JSON internally
|
// The following line loads JSON internally
|
||||||
// _ "v2ray.com/core/main/jsonem"
|
_ "v2ray.com/core/main/jsonem"
|
||||||
|
|
||||||
// Load config from file or http(s)
|
// Load config from file or http(s)
|
||||||
_ "v2ray.com/core/main/confloader/external"
|
_ "v2ray.com/core/main/confloader/external"
|
||||||
|
Loading…
Reference in New Issue
Block a user