fix merge conflicts

This commit is contained in:
jomo
2014-07-13 16:35:21 +02:00

View File

@@ -137,7 +137,6 @@ If you want the server to load a file (*module*) on startup, add it to the `modu
> Adds `/damnspam`, creates timeout for buttons/levers to mitigate button spam.
# Code styleguide & tips
## Indentation