mirror of
https://github.com/amnezia-vpn/amnezia-client.git
synced 2026-05-08 14:33:23 +00:00
Merge conflicts in .gitmodules resolved
This commit is contained in:
3
.gitmodules
vendored
3
.gitmodules
vendored
@@ -16,3 +16,6 @@
|
||||
[submodule "client/3rd/outline-go-tun2socks"]
|
||||
path = client/3rd/outline-go-tun2socks
|
||||
url = https://github.com/Jigsaw-Code/outline-go-tun2socks.git
|
||||
[submodule "client/3rd/qzxing"]
|
||||
path = client/3rd/qzxing
|
||||
url = https://github.com/ftylitak/qzxing.git
|
||||
|
||||
Reference in New Issue
Block a user