Resolve conflicts due merge #219

This commit is contained in:
Alan Marshall 2024-07-24 14:57:02 +01:00
parent 641128eebf
commit c53003d3d5
Signed by: alangm
GPG Key ID: 4DF85D1B967F51A6

View File

@ -1047,7 +1047,8 @@
},
"install_package_set_minimal": {
"profiles": {
"rocky-package-set-x86_64-*-uefi": 30
"rocky-package-set-aarch64-*-aarch64": 30,
"rocky-package-set-x86_64-*-bios": 30
},
"settings": {
"DESKTOP": "false",
@ -1056,7 +1057,8 @@
},
"install_package_set_server": {
"profiles": {
"rocky-package-set-x86_64-*-uefi": 30
"rocky-package-set-aarch64-*-aarch64": 30,
"rocky-package-set-x86_64-*-bios": 30
},
"settings": {
"DESKTOP": "false",
@ -1065,7 +1067,8 @@
},
"install_package_set_graphical-server": {
"profiles": {
"rocky-package-set-x86_64-*-uefi": 30
"rocky-package-set-aarch64-*-aarch64": 30,
"rocky-package-set-x86_64-*-bios": 30
},
"settings": {
"DESKTOP": "gnome",