fix git merge issue

PadelClub.xcodeproj/project.pbxproj

@@ -1896,11 +1896,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
 				CODE_SIGN_STYLE = Automatic;
-<<<<<<< HEAD
-				CURRENT_PROJECT_VERSION = 44;
-=======
 				CURRENT_PROJECT_VERSION = 45;
->>>>>>> 599c942c5910dc651db20fcea6c660dff139e08c
 				DEFINES_MODULE = YES;
 				DEVELOPMENT_ASSET_PATHS = "\"PadelClub/Preview Content\"";
 				DEVELOPMENT_TEAM = BQ3Y44M3Q6;