Fix mismerge
authorRuben Kerkhof <ruben@rubenkerkhof.com>
Fri, 30 Jun 2017 14:53:12 +0000 (16:53 +0200)
committerRuben Kerkhof <ruben@rubenkerkhof.com>
Fri, 30 Jun 2017 14:53:12 +0000 (16:53 +0200)

No differences found