Fix hidden merge conflict in setup.py
Fix hidden merge conflict in setup.py

The install_requires parameter was added in both branches at different
locations.

pymad/jpymad,pymad/cpymad,pymad/cpymad,pymad/jpymad,pymad/jpymad