From a2fc61320db21943424871c0d225c6b2c6e7d153 Mon Sep 17 00:00:00 2001
From: kagahd <kay.agahd@idealo.de>
Date: Mon, 11 Mar 2024 08:45:44 +0100
Subject: [PATCH] resolve merge conflicts for a second time due to bug in PR
 #829

---
 test/backend/assets/sidecar/metadata.jpg.json       | 2 +-
 test/backend/assets/sidecar/no_metadata.jpg.json    | 2 +-
 test/backend/assets/sidecar/no_metadata_v2.jpg.json | 2 +-
 test/backend/assets/sidecar/no_metadata_v3.jpg.json | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/test/backend/assets/sidecar/metadata.jpg.json b/test/backend/assets/sidecar/metadata.jpg.json
index be6c8652..ab25b9b8 100644
--- a/test/backend/assets/sidecar/metadata.jpg.json
+++ b/test/backend/assets/sidecar/metadata.jpg.json
@@ -3,7 +3,7 @@
     "width": 10,
     "height": 5
   },
-  "creationDate": 1709549328178,
+  "creationDate": 1710142352337,
   "fileSize": 4489,
   "keywords": [
     "floor",
diff --git a/test/backend/assets/sidecar/no_metadata.jpg.json b/test/backend/assets/sidecar/no_metadata.jpg.json
index cfda0909..d1313eb0 100644
--- a/test/backend/assets/sidecar/no_metadata.jpg.json
+++ b/test/backend/assets/sidecar/no_metadata.jpg.json
@@ -3,7 +3,7 @@
     "width": 10,
     "height": 5
   },
-  "creationDate": 1709549328185,
+  "creationDate": 1710142352343,
   "fileSize": 1430,
   "keywords": [
     "first",
diff --git a/test/backend/assets/sidecar/no_metadata_v2.jpg.json b/test/backend/assets/sidecar/no_metadata_v2.jpg.json
index 39768d78..62450471 100644
--- a/test/backend/assets/sidecar/no_metadata_v2.jpg.json
+++ b/test/backend/assets/sidecar/no_metadata_v2.jpg.json
@@ -3,7 +3,7 @@
     "width": 10,
     "height": 5
   },
-  "creationDate": 1709549328188,
+  "creationDate": 1710142352347,
   "fileSize": 1430,
   "keywords": [
     "first",
diff --git a/test/backend/assets/sidecar/no_metadata_v3.jpg.json b/test/backend/assets/sidecar/no_metadata_v3.jpg.json
index b96e4ade..4d721ed8 100644
--- a/test/backend/assets/sidecar/no_metadata_v3.jpg.json
+++ b/test/backend/assets/sidecar/no_metadata_v3.jpg.json
@@ -3,7 +3,7 @@
     "width": 10,
     "height": 5
   },
-  "creationDate": 1709549328189,
+  "creationDate": 1710142352352,
   "fileSize": 1430,
   "keywords": [
     "first"