Resolve merge conflict

This commit is contained in:
Kristoffer Dalby committed 2021-08-13 10:33:19 +01:00
1 parent 5bfcf5c917
commit 9698abbfd5
10 files changed
+180 -139

No files matched your search

+1 -4
View File
@@ -169,10 +169,7 @@ func (h *Headscale) checkForNamespacesPendingUpdates() {
continue
}
for _, m := range *machines {
err = h.notifyChangesToPeers(&m)
if err != nil {
continue
}
h.notifyChangesToPeers(&m)
}
}
newV, err := h.getValue("namespaces_pending_updates")