mirror of
https://github.com/RPCSX/rpcsx.git
synced 2025-12-06 07:12:14 +01:00
fix merge error
This commit is contained in:
parent
08e2ab70b4
commit
fe149ab7a6
2
.gitmodules
vendored
2
.gitmodules
vendored
|
|
@ -137,5 +137,5 @@
|
||||||
url = ../../nlohmann/json.git
|
url = ../../nlohmann/json.git
|
||||||
ignore = dirty
|
ignore = dirty
|
||||||
[submodule "3rdparty/libadrenotools"]
|
[submodule "3rdparty/libadrenotools"]
|
||||||
path = 3rdparty/libadrenotools
|
path = rpcs3/3rdparty/libadrenotools
|
||||||
url = ../../bylaws/libadrenotools.git
|
url = ../../bylaws/libadrenotools.git
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue