Removed merge markers from bokeh/properties.py file
Merge pull request #41 from synasius/fix-merge-issue

Removed merge markers from bokeh/properties.py file