Remove the conflict from tools.hbs

This commit is contained in:
Piotr Sarnacki 2014-01-10 17:33:46 +01:00
parent 8fb194b557
commit 7ddeb5cfa8

View File

@ -58,11 +58,7 @@
<p>
Integrating <a href="https://codeclimate.com">Code Climate's test coverage</a> reporting with your test
suite on Travis CI allows to track changes in coverage over time. If you haven't tried it out already, <a
<<<<<<< HEAD
{{bindAttr href="Travis.config.code_climate_url"}}" target="_blank">sign
=======
{{bind-attr href="Travis.config.code_climate_url"}}" target="_blank">sign
>>>>>>> 60d42738019a33cc73008e81dd0a80eaa6eac147
up today</a> to improve your code's quality. New customers get 20% off for the first three months!
</p>