Resolve conflicts.
This commit is contained in:
parent
dae5042fc6
commit
62711f8699
@ -201,7 +201,6 @@ postgresql:
|
|||||||
|
|
||||||
# Minio Section. Use this to configure Minio storage.
|
# Minio Section. Use this to configure Minio storage.
|
||||||
# If you want to use external storage, disable this.
|
# If you want to use external storage, disable this.
|
||||||
minio:
|
|
||||||
minio:
|
minio:
|
||||||
enabled: true
|
enabled: true
|
||||||
|
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user