openlayers/openlayers — pull request #1192 by marcjansen (2013-12-02 08:24:42+00:00)
Title: Remove merge-markers from test.

This removes a `SyntaxError` in `tests/Filter/Comparison.html`.

This test now passes for me again.

Please review.