Little merge conflict

This commit is contained in:
Hamzenis Kryeziu 2025-03-02 17:36:01 +01:00
parent 80e82e60ae
commit e7fa2d3eba

View file

@ -378,6 +378,15 @@
path = Components; path = Components;
sourceTree = "<group>"; sourceTree = "<group>";
}; };
730C73542D726D83001EC57C /* Analytics */ = {
isa = PBXGroup;
children = (
7374EF372D74AEEA00319CEC /* UIDevice+Model.swift */,
730C73552D726DA5001EC57C /* Analytics.swift */,
);
path = Analytics;
sourceTree = "<group>";
};
/* End PBXGroup section */ /* End PBXGroup section */
/* Begin PBXNativeTarget section */ /* Begin PBXNativeTarget section */
@ -630,7 +639,7 @@
CODE_SIGN_STYLE = Automatic; CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 1; CURRENT_PROJECT_VERSION = 1;
DEVELOPMENT_ASSET_PATHS = "\"Sora/Preview Content\""; DEVELOPMENT_ASSET_PATHS = "\"Sora/Preview Content\"";
DEVELOPMENT_TEAM = 399LMK6Q2Y; DEVELOPMENT_TEAM = 44V6G67299;
"ENABLE_HARDENED_RUNTIME[sdk=macosx*]" = NO; "ENABLE_HARDENED_RUNTIME[sdk=macosx*]" = NO;
ENABLE_PREVIEWS = YES; ENABLE_PREVIEWS = YES;
GENERATE_INFOPLIST_FILE = YES; GENERATE_INFOPLIST_FILE = YES;
@ -648,7 +657,7 @@
"@executable_path/Frameworks", "@executable_path/Frameworks",
); );
MARKETING_VERSION = 0.2.0; MARKETING_VERSION = 0.2.0;
PRODUCT_BUNDLE_IDENTIFIER = me.cranci.Sora; PRODUCT_BUNDLE_IDENTIFIER = me.hamzo.Sora;
PRODUCT_NAME = "$(TARGET_NAME)"; PRODUCT_NAME = "$(TARGET_NAME)";
SUPPORTS_MACCATALYST = YES; SUPPORTS_MACCATALYST = YES;
SWIFT_EMIT_LOC_STRINGS = YES; SWIFT_EMIT_LOC_STRINGS = YES;
@ -666,7 +675,7 @@
CODE_SIGN_STYLE = Automatic; CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 1; CURRENT_PROJECT_VERSION = 1;
DEVELOPMENT_ASSET_PATHS = "\"Sora/Preview Content\""; DEVELOPMENT_ASSET_PATHS = "\"Sora/Preview Content\"";
DEVELOPMENT_TEAM = 399LMK6Q2Y; DEVELOPMENT_TEAM = 44V6G67299;
"ENABLE_HARDENED_RUNTIME[sdk=macosx*]" = NO; "ENABLE_HARDENED_RUNTIME[sdk=macosx*]" = NO;
ENABLE_PREVIEWS = YES; ENABLE_PREVIEWS = YES;
GENERATE_INFOPLIST_FILE = YES; GENERATE_INFOPLIST_FILE = YES;
@ -684,7 +693,7 @@
"@executable_path/Frameworks", "@executable_path/Frameworks",
); );
MARKETING_VERSION = 0.2.0; MARKETING_VERSION = 0.2.0;
PRODUCT_BUNDLE_IDENTIFIER = me.cranci.Sora; PRODUCT_BUNDLE_IDENTIFIER = me.hamzo.Sora;
PRODUCT_NAME = "$(TARGET_NAME)"; PRODUCT_NAME = "$(TARGET_NAME)";
SUPPORTS_MACCATALYST = YES; SUPPORTS_MACCATALYST = YES;
SWIFT_EMIT_LOC_STRINGS = YES; SWIFT_EMIT_LOC_STRINGS = YES;