From 79d3c7f9a2ac9ad7fb0d647565061ad464e22070 Mon Sep 17 00:00:00 2001
From: laurenspriem <github_uni.fishers@aleeas.com>
Date: Fri, 1 Aug 2025 12:40:15 +0200
Subject: [PATCH] Merge conflict left

---
 mobile/apps/photos/pubspec.yaml | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/mobile/apps/photos/pubspec.yaml b/mobile/apps/photos/pubspec.yaml
index fd1cb9478c..c2858a59a2 100644
--- a/mobile/apps/photos/pubspec.yaml
+++ b/mobile/apps/photos/pubspec.yaml
@@ -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: