diff options
author | jomo <github@jomo.tv> | 2014-07-13 16:35:21 +0200 |
---|---|---|
committer | jomo <github@jomo.tv> | 2014-07-13 16:35:21 +0200 |
commit | d67bf75c240f6d0cfaa828fa258218a35080d155 (patch) | |
tree | 1fab6cc3ee066286b5a2a2db4af2594a5bec353a /README.md | |
parent | 568b619122722cfc47b77e83ee1ce7ea8fbca9c0 (diff) | |
parent | 41e1d3c65e965a8e4087027445023c34cd57acfe (diff) |
fix merge conflicts
Diffstat (limited to 'README.md')
-rw-r--r-- | README.md | 1 |
1 files changed, 0 insertions, 1 deletions
@@ -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 |