Jakob Schrettenbrunner 72ac95267b fix some merge fails

2017-10-09 21:01:24 +02:00

..

root.go

fix some merge fails

2017-10-09 21:01:24 +02:00