Skip to content

NSAttributedString; NRTestAppAsFramework#437

Open
cdillard-NewRelic wants to merge 40 commits intodevelopfrom
NRTestAppAsFramework
Open

NSAttributedString; NRTestAppAsFramework#437
cdillard-NewRelic wants to merge 40 commits intodevelopfrom
NRTestAppAsFramework

Conversation

@cdillard-NewRelic
Copy link
Member

No description provided.

cdillard-NewRelic and others added 25 commits July 28, 2025 17:36
…ewrelic/newrelic-ios-agent into NRTestAppAsFramework

# Conflicts:
#	Test Harness/NRTestApp/NRTestApp.xcodeproj/project.pbxproj
…ewrelic/newrelic-ios-agent into NRTestAppAsFramework
…into NRTestAppAsFramework

# Conflicts:
#	Test Harness/NRTestApp/NRTestApp.xcodeproj/project.pbxproj
#	Test Harness/NRTestApp/NRTestApp/Navigation/MainCoordinator.swift
#	Test Harness/NRTestApp/NRTestApp/ViewControllers/ViewController.swift
… NRTestAppAsFramework

# Conflicts:
#	.github/workflows/uploadApp.yml
#	.github/workflows/wdio.yml
#	Agent.xcodeproj/project.pbxproj
#	Agent/SessionReplay/SessionReplayCapture.swift
#	LambdaTest/uploadAppToLambdaTest.mjs
#	LambdaTest/wdio-config-ios.js
#	Package.swift
#	Test Harness/NRTestApp/NRTestApp.xcodeproj/project.pbxproj
#	Test Harness/NRTestApp/NRTestApp.xcodeproj/xcshareddata/xcschemes/NRTestApp.xcscheme
#	libMobileAgent/ext/JSON/json.xcodeproj/project.pbxproj
#	libMobileAgent/src/Analytics/Analytics.xcodeproj/project.pbxproj
#	libMobileAgent/src/Connectivity/Connectivity.xcodeproj/project.pbxproj
#	libMobileAgent/src/Hex/Hex.xcodeproj/project.pbxproj
#	libMobileAgent/src/Utilities/Utilities/Utilities.xcodeproj/project.pbxproj
#	package-lock.json
#	package.json
… NRTestAppAsFramework

# Conflicts:
#	Test Harness/NRTestApp/NRTestApp.xcodeproj/project.pbxproj
… NRTestAppAsFramework

# Conflicts:
#	Test Harness/NRTestApp/NRTestApp/Navigation/MainCoordinator.swift
#	Test Harness/NRTestApp/NRTestApp/Navigation/ViewControllerProvider.swift
… NRTestAppAsFramework

# Conflicts:
#	Test Harness/NRTestApp/NRTestApp/Navigation/MainCoordinator.swift
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants

Comments