Skip to content

Commit

Permalink
Merge branch 'main' into check-conflicts
Browse files Browse the repository at this point in the history
# Conflicts:
#	CHANGELOG.md
#	src/android/build.gradle
#	src/android/com/outsystems/plugins/healthfitness/OSHealthFitness.kt
#	src/ios/frameworks/OSHealthFitnessLib.xcframework/ios-arm64/OSHealthFitnessLib.framework/Info.plist
#	src/ios/frameworks/OSHealthFitnessLib.xcframework/ios-arm64/OSHealthFitnessLib.framework/OSHealthFitnessLib
#	src/ios/frameworks/OSHealthFitnessLib.xcframework/ios-arm64_x86_64-simulator/OSHealthFitnessLib.framework/Info.plist
#	src/ios/frameworks/OSHealthFitnessLib.xcframework/ios-arm64_x86_64-simulator/OSHealthFitnessLib.framework/OSHealthFitnessLib
#	src/ios/frameworks/OSHealthFitnessLib.xcframework/ios-arm64_x86_64-simulator/OSHealthFitnessLib.framework/_CodeSignature/CodeResources
#	www/OSHealthFitness.js
  • Loading branch information
alexgerardojacinto committed Apr 9, 2024
2 parents daa59e8 + caf11db commit 1b9ed63
Showing 0 changed files with 0 additions and 0 deletions.

0 comments on commit 1b9ed63

Please sign in to comment.