Commit a9c84329 authored by Sébastiaan Versteeg's avatar Sébastiaan Versteeg
Browse files

Merge branch 'trailing_whitespaces' into 'master'

Remove trailing whitespaces

See merge request !873
parents 0cb1bcf0 70bd8b67
...@@ -32,7 +32,7 @@ Testing and linting ...@@ -32,7 +32,7 @@ Testing and linting
1. In the root folder of the project, run `tox`. 1. In the root folder of the project, run `tox`.
You may get errors about missing interpreters. That is normal and can be You may get errors about missing interpreters. That is normal and can be
ignored. If you want to run a specific check, you can do the following: ignored. If you want to run a specific check, you can do the following:
tox -e flake8 # Runs the flake8 linter tox -e flake8 # Runs the flake8 linter
......
...@@ -18,7 +18,7 @@ commands = ...@@ -18,7 +18,7 @@ commands =
python manage.py makemigrations --no-input --check --dry-run python manage.py makemigrations --no-input --check --dry-run
python -Wall -mcoverage run --branch --source '.' manage.py test python -Wall -mcoverage run --branch --source '.' manage.py test
safety check safety check
deps = deps =
coverage coverage
pip-conflict-checker pip-conflict-checker
django20: django>=2.0rc1,<2.1 django20: django>=2.0rc1,<2.1
......
...@@ -127,7 +127,7 @@ ...@@ -127,7 +127,7 @@
{% if permissions.create_registration %} {% if permissions.create_registration %}
<p> <p>
{% url 'event-registration-terms' as terms_url %} {% url 'event-registration-terms' as terms_url %}
{% blocktrans trimmed %} {% blocktrans trimmed %}
By registering, By registering,
you confirm that you have read the <a target="_blank" href="{{ terms_url }}">terms and conditions</a>, you confirm that you have read the <a target="_blank" href="{{ terms_url }}">terms and conditions</a>,
that you understand them and that you agree to be bound by them. that you understand them and that you agree to be bound by them.
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment