remove redundant server.properties
Merge branch 'tekkit'