Install file got merge conflict

[Carreau]

As seen here.
https://github.com/matplotlib/matplotlib/blob/master/INSTALL#L197-L219

Also, the install instruction on os x did not work for me I had to add the following export

 export LDFLAGS="-L/usr/local/Cellar/freetype/2.5.3_1/include/freetype2/";
 export CPPFLAGS="-I/usr/local/Cellar/freetype/2.5.3_1/include/freetype2/";
 python3 setup.py install

Should I add lines in README.osx ?

(and sorry for posting with empty bodies for people that get this issue by mail)

[tacaswell]

Sorry, the merge conflict is my fault, I will take care of that.

[Carreau]

Sorry, the merge conflict is my fault, I will take care of that.

No problem, I can do it too, mainly opened an issue because I can't do it right now and I will forget after.

I would also add an rst extension to the file to have it render on github, but it might break links.

[tacaswell]

see #3002

Adding the extension would require touching the sphinx set up as well as the INSTALL file is embedded in the docs directly.

[tacaswell]

Closing as this is fixed.