Merge branch 'master' into crusttest-refactoring
yes i know this is an ugly empty merge commit, I could NOT get it to rebase without creating massive vomit
This commit is contained in:
@@ -27,7 +27,6 @@ turn = false
|
|||||||
callForReset = false
|
callForReset = false
|
||||||
vote = true
|
vote = true
|
||||||
|
|
||||||
|
|
||||||
[vm]
|
[vm]
|
||||||
type = "qemu"
|
type = "qemu"
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user