Fix conflict 94/head
authorMirio <opivy@hotmail.de>
Tue, 21 Mar 2017 14:01:55 +0000 (15:01 +0100)
committerMirio <opivy@hotmail.de>
Tue, 21 Mar 2017 14:01:55 +0000 (15:01 +0100)
commitf2ac31fa826e6304d9d96f3e71d3b70c1797e15a
tree9566a45baeb6df68b588a5cfb7e4a609501142e5
parent3fb0eec8cc746eabcad83f9e9b3c91b239c10e3e
parentbd7dc2b06e507e2e049df31e62e28dc71fb012a6
Fix conflict
maps/dance.map.options