And the uplink holders' capabilities return

The same split lost them the other way round: the merge base held both changes, each branch had reset
the other's files, and the three-way merge kept neither. Both halves of hq ADR 0161 are on main again
with this.
This commit is contained in:
2026-10-01 17:19:41 +02:00
parent 89e0dde9e0
commit 01d68bda88
3 changed files with 6 additions and 3 deletions
+2 -1
View File
@@ -3,7 +3,8 @@
"version": "1", "version": "1",
"capabilities": [ "capabilities": [
"package-manager", "package-manager",
"service-manager" "service-manager",
"uplink-dhcpcd"
], ],
"claims": [ "claims": [
{ {
+2 -1
View File
@@ -3,7 +3,8 @@
"version": "1", "version": "1",
"capabilities": [ "capabilities": [
"package-manager", "package-manager",
"service-manager" "service-manager",
"uplink-networkmanager"
], ],
"claims": [ "claims": [
{ {
+2 -1
View File
@@ -3,7 +3,8 @@
"version": "1", "version": "1",
"capabilities": [ "capabilities": [
"package-manager", "package-manager",
"service-manager" "service-manager",
"uplink-systemd-networkd"
], ],
"claims": [ "claims": [
{ {