Merge conflict left

This commit is contained in:
laurenspriem
2025-08-01 12:40:15 +02:00
parent 108d9f84fc
commit 79d3c7f9a2

View File

@@ -12,11 +12,7 @@ description: ente photos application
# Read more about iOS versioning at
# https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
<<<<<<< HEAD
version: 1.1.63+1097
=======
version: 1.2.0+1200
>>>>>>> main
publish_to: none
environment: