fix merge conflicts and do some refactoring

This commit is contained in:
Simon Aronsson 2019-04-08 17:38:17 +02:00
commit a2158c2bdc
5 changed files with 239 additions and 180 deletions

3
.gitignore vendored
View file

@ -2,4 +2,5 @@ watchtower
vendor
.glide
dist
.idea
.idea
.DS_Store