Compare commits

...

2 commits

Author SHA1 Message Date
09f085336e
s 2024-05-28 11:09:24 +02:00
686fa86c3f
conflicttest 2024-05-28 11:07:33 +02:00
2 changed files with 5 additions and 1 deletions

View file

@ -1,3 +1,5 @@
# test
{
'hostname': '10.0.0.2',
'groups': [
@ -111,7 +113,7 @@
},
'nextcloud': {
'hostname': 'cloud.sublimity.de',
'version': '28.0.1',
'version': '29.0.1',
'config': {
'instanceid': 'oci6dw1woodz',
'secret': '!decrypt:encrypt$gAAAAABj96CFynVtEgsje7173zjQAcY7xQG3uyf5cxE-sJAvhyPh_KUykTKdwnExc8NTDJ8RIGUmVfgC6or5crnYaggARPIEg5-Cb0xVdEPPZ3oZ01ImLmynLu3qXT9O8kVM-H21--OKeztMRn7bySsbXdWEGtETFQ==',

View file

@ -1,3 +1,5 @@
# test
{
'hostname': '202.61.255.108',
'groups': [