Revert "Fix merge"

This reverts commit 29228a0c11.
This commit is contained in:
TheManii 2016-04-08 09:59:56 -07:00
parent 29228a0c11
commit de2ec984e4
2 changed files with 11 additions and 11 deletions

View file

@ -1,5 +1,5 @@
[General]
server_ip=192.168.1.124
server_ip=127.0.0.1
showtimestamp = true
[Database]