resolved merge conflicts

sophia-chen-ttd · sophia-chen-ttd · commit 639176158cf9 · 2025-05-09T11:50:06.000+10:00
diff --git a/src/main/resources/localstack/s3/core/salts/metadata.json b/src/main/resources/localstack/s3/core/salts/metadata.json
@@ -11,9 +11,9 @@
     "location" : "salts/salts.txt.1670796729291",
     "size" : 2
   },{
-      "effective" : 1746571958133,
+      "effective" : 1745907348982,
       "expires" : 1766720293000,
-      "location" : "salts/salts.txt.1746571958133",
+      "location" : "salts/salts.txt.1745907348982",
       "size" : 4
     }
   ]
diff --git a/src/main/resources/localstack/s3/core/salts/salts.txt.1670796729291 b/src/main/resources/localstack/s3/core/salts/salts.txt.1670796729291
@@ -1,2 +1,2 @@
-1000000,1614556800000,vgv1BwiNRCW7F3VcNXHlZh+7oHJ4G4gCshbGcVOLnss=
-1000001,1643235130717,vgv1BwiNRCW7F3VcNXHlZh+7oHJ4G4gCshbGcVOLnsP=
+1000000,1614556800000,vgv1BwiNRCW7F3VcNXHlZh+7oHJ4G4gCshbGcVOLnss=,,,,,,,,
+1000001,1643235130717,vgv1BwiNRCW7F3VcNXHlZh+7oHJ4G4gCshbGcVOLnsP=,,,,,,,,
diff --git a/src/main/resources/localstack/s3/core/salts/salts.txt.1745907348982 b/src/main/resources/localstack/s3/core/salts/salts.txt.1745907348982
@@ -1,4 +1,4 @@
-1000000,1614556800000,vgv1BwiNRCW7F3VcNXHlZh+7oHJ4G4gCshbGcVOLnss=
-1000001,1643235130717,vgv1BwiNRCW7F3VcNXHlZh+7oHJ4G4gCshbGcVOLnss=
-1000002,1614556000010,vgv1BwiNRCW7F3VcNXHlZh+7oHJ4G4gCshbGcVOLnss=
-1000003,1643235230717,vgv1BwiNRCW7F3VcNXHlZh+7oHJ4G4gCshbGcVOLnss=
+1000000,1614556800000,vgv1BwiNRCW7F3VcNXHlZh+7oHJ4G4gCshbGcVOLnss=,,,,,,,,
+1000001,1643235130717,vgv1BwiNRCW7F3VcNXHlZh+7oHJ4G4gCshbGcVOLnss=,,,,,,,,
+1000002,1614556000010,vgv1BwiNRCW7F3VcNXHlZh+7oHJ4G4gCshbGcVOLnss=,,,,,,,,
+1000003,1643235230717,vgv1BwiNRCW7F3VcNXHlZh+7oHJ4G4gCshbGcVOLnss=,,,,,,,,

Original file line number	Diff line number	Diff line change
`@@ -11,9 +11,9 @@`
`11`	`11`	`"location" : "salts/salts.txt.1670796729291",`
`12`	`12`	`"size" : 2`
`13`	`13`	`},{`
`14`		`- "effective" : 1746571958133,`
	`14`	`+ "effective" : 1745907348982,`
`15`	`15`	`"expires" : 1766720293000,`
`16`		`- "location" : "salts/salts.txt.1746571958133",`
	`16`	`+ "location" : "salts/salts.txt.1745907348982",`
`17`	`17`	`"size" : 4`
`18`	`18`	`}`
`19`	`19`	`]`