ContinuumIO/Bokeh — pull request #41 by synasius (2013-06-20 07:54:06+00:00)
Title: Removed merge markers from bokeh/properties.py file

Hi,

I removed merge marker from the properties.py module otherwise library won't work.I hope this is ok!