From fe149ab7a639896c0029b7363e6cbf6eb16d9f65 Mon Sep 17 00:00:00 2001 From: DH Date: Sat, 5 Apr 2025 03:55:22 +0300 Subject: [PATCH] fix merge error --- .gitmodules | 2 +- {3rdparty => rpcs3/3rdparty}/libadrenotools | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename {3rdparty => rpcs3/3rdparty}/libadrenotools (100%) diff --git a/.gitmodules b/.gitmodules index 6aeca545e..48457e4c6 100644 --- a/.gitmodules +++ b/.gitmodules @@ -137,5 +137,5 @@ url = ../../nlohmann/json.git ignore = dirty [submodule "3rdparty/libadrenotools"] - path = 3rdparty/libadrenotools + path = rpcs3/3rdparty/libadrenotools url = ../../bylaws/libadrenotools.git diff --git a/3rdparty/libadrenotools b/rpcs3/3rdparty/libadrenotools similarity index 100% rename from 3rdparty/libadrenotools rename to rpcs3/3rdparty/libadrenotools