4
0
mirror of https://github.com/cwinfo/yggdrasil-go.git synced 2025-06-14 20:56:05 +00:00

fix merge conflict

This commit is contained in:
Arceliar
2019-01-26 14:27:37 -06:00
2 changed files with 29 additions and 11 deletions

View File

@ -117,6 +117,8 @@ func bubbleUpTo(sets []keySet, num int) []keySet {
var tmp = sets[i]
sets[i] = sets[i+1]
sets[i+1] = tmp
} else {
break
}
}
return sets