Merge conflicts in .gitmodules resolved

This commit is contained in:
Alex Kh 2021-12-21 23:21:10 +04:00
commit 39e348948c
67 changed files with 855 additions and 2234 deletions

3
.gitmodules vendored
View file

@ -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