fixed conflict
authorEinar Jørgen Haraldseid <einar@haraldseid.net>
Fri, 2 Jun 2017 20:13:33 +0000 (22:13 +0200)
committerEinar Jørgen Haraldseid <einar@haraldseid.net>
Fri, 2 Jun 2017 20:13:33 +0000 (22:13 +0200)
commitf61c6e101a8ccc6559c475b33d2fa0a7ba0a96ba
treedc98a42b2747b6bed6a39b92c4107aa97f34a328
parent578b34cf01a5acc18d024df1884e20f799bb2b52
parentb54b187e73a58eb84029383355ae66f95d17d75a
fixed conflict