merge conflict
authorMirio <opivy@hotmail.de>
Sun, 26 Feb 2017 19:19:12 +0000 (20:19 +0100)
committerMirio <opivy@hotmail.de>
Sun, 26 Feb 2017 19:19:12 +0000 (20:19 +0100)
1  2 
maps/fuse.map

diff --cc maps/fuse.map
Simple merge