Bitbucket cannot automatically merge this request.
The commits that make up this pull request have been removed.
Bitbucket cannot automatically merge this request due to conflicts.
Review the conflicts on the Overview tab. You can then either decline the request or merge it manually on your local system using the following commands:
git checkout master
git remote add pricetx/hlstatsx-community-edition https://bitbucket.org/pricetx/hlstatsx-community-edition.git
git fetch pricetx/hlstatsx-community-edition
git merge --no-ff -m 'Merged in pricetx/hlstatsx-community-edition (pull request #14)' remotes/pricetx/hlstatsx-community-edition/master
Made compatible with PHP 7. Changes include:
- explicitly declaring arrays
- replacing mysql with mysqli
- renaming constructor functions to __constructor()
I have tested the changes in a test environment and everything seems fine, running PHP 7.1 via docker.