resolve conflict

This commit is contained in:
Cayo Puigdefabregas 2022-09-07 14:10:11 +02:00
commit c421bdad94

View file

@ -1,11 +1,14 @@
isos = { isos = {
"demo": { "demo": {
'iso': "USODY_2022.5.2-beta.iso", 'iso': "USODY_2022.8.0-Demo.iso",
'url': 'http://releases.usody.com/demo/', 'url': 'http://releases.usody.com/demo/',
}, },
"2022": { "2022": {
'iso': "USODY_2022.5.2-beta.iso", 'iso': "USODY_2022.8.0-beta.iso",
'url': 'http://releases.usody.com/2022/', 'url': 'http://releases.usody.com/2022/',
}, },
"v14": {'iso': "USODY_14.0.0.iso", 'url': 'http://releases.usody.com/v14/'}, "v14": {
'iso': "USODY_14.0.0.iso",
'url': 'http://releases.usody.com/v14/',
},
} }