neoarz/SideStore
1
0
Fork 0
mirror of https://github.com/SideStore/SideStore.git synced 2026-02-09 06:43:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix conflicts

Browse Source
This commit is contained in:
June
2024-12-28 09:41:48 +09:00
parent af26262b6b
commit 9a598f701a
1 changed files with 0 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
AltStore.xcodeproj/project.pbxproj
View File

@@ -3743,25 +3743,6 @@
/* End XCConfigurationList section */
/* Begin XCRemoteSwiftPackageReference section */
<<<<<<< refs/remotes/origin/develop
=======
A81176FC2D0B3BAB00D6C122 /* XCRemoteSwiftPackageReference "OpenSSL" */ = {
isa = XCRemoteSwiftPackageReference;
repositoryURL = "https://github.com/krzyzanowskim/OpenSSL";
requirement = {
kind = upToNextMajorVersion;
minimumVersion = 1.1.2000;
};
};
A81176FF2D0B3C6C00D6C122 /* XCRemoteSwiftPackageReference "AltSign" */ = {
isa = XCRemoteSwiftPackageReference;
repositoryURL = "https://github.com/SideStore/AltSign";
requirement = {
kind = revision;
revision = 383f1650872fd94fe892923f3f24c0dd01ae5b0a;
};
};
>>>>>>> fixate AltSign
A82067C22D03E0DE00645C0D /* XCRemoteSwiftPackageReference "SemanticVersion" */ = {
isa = XCRemoteSwiftPackageReference;
repositoryURL = "https://github.com/SwiftPackageIndex/SemanticVersion";