resolve merge conflicts for a second time due to bug in PR bpatrik#829

kagahd · Mar 11, 2024 · a2fc613 · a2fc613
1 parent f05ee7a
commit a2fc613
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git 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
@@ -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
@@ -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
@@ -3,7 +3,7 @@
     "width": 10,
     "height": 5
   },
-  "creationDate": 1709549328189,
+  "creationDate": 1710142352352,
   "fileSize": 1430,
   "keywords": [
     "first"