conflicttest #17

Closed
cronekorkn wants to merge 2 commits from conflecttest into master
Showing only changes of commit 09f085336e - Show all commits

View file

@ -1,3 +1,5 @@
# test
{
'hostname': '202.61.255.108',
'groups': [