fix broken merge
authorAdi Kriegisch <adi@kriegisch.at>
Tue, 20 Dec 2016 14:28:02 +0000 (15:28 +0100)
committerAdi Kriegisch <adi@kriegisch.at>
Tue, 20 Dec 2016 14:28:02 +0000 (15:28 +0100)
commit77c817f68631cab7bb46770c80703a99bdeb1310
tree163b47c8bac58a403df6c126af4c977f9ea6e70c
parent6bb101d3ba98fbebbc1c7cb77916c351358ca39e
fix broken merge
CONTRIBUTING.md