merge error
This commit is contained in:
parent
9ee3f02a10
commit
2c9a35effb
|
@ -5,13 +5,8 @@
|
||||||
"description": "file://DESCRIPTION.md",
|
"description": "file://DESCRIPTION.md",
|
||||||
"changelog": "file://CHANGELOG",
|
"changelog": "file://CHANGELOG",
|
||||||
"tagline": "Distributed object storage",
|
"tagline": "Distributed object storage",
|
||||||
<<<<<<< HEAD
|
|
||||||
"version": "3.3.3",
|
|
||||||
"upstreamVersion": "2022-12-12T19-27-27Z",
|
|
||||||
=======
|
|
||||||
"version": "3.4.0",
|
"version": "3.4.0",
|
||||||
"upstreamVersion": "2023-01-02T09-40-09Z",
|
"upstreamVersion": "2023-01-02T09-40-09Z",
|
||||||
>>>>>>> d881396 (Version 3.4.0)
|
|
||||||
"healthCheckPath": "/minio/login",
|
"healthCheckPath": "/minio/login",
|
||||||
"memoryLimit": 805306368,
|
"memoryLimit": 805306368,
|
||||||
"httpPort": 8000,
|
"httpPort": 8000,
|
||||||
|
|
Loading…
Reference in New Issue