Haldis/haldis
5
0
Fork 0
Code Issues 39 Pull requests Projects Releases Packages Wiki Activity

Fix unresolved merge conflict

Browse source
This commit is contained in:
Jan-Pieter Baert 2019-09-13 16:51:38 +02:00
parent 0af72376a1
commit f394fb7911
No known key found for this signature in database
GPG key ID: B19186932178234A
1 changed files with 1 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
app/app.py
View file

@ -166,14 +166,9 @@ def add_template_filters(app: Flask) -> None:
return str(datetime.now().year) return str(datetime.now().year)
@app.template_filter("euro") @app.template_filter("euro")
<<<<<<< HEAD
def euro(value: int) -> str: def euro(value: int) -> str:
return euro_string(value)
=======
def euro(value: int) -> None:
"A function which converts a value to its euro_string" "A function which converts a value to its euro_string"
euro_string(value) return euro_string(value)
>>>>>>> Fix pylint for Haldis
# For usage when you directly call the script with python # For usage when you directly call the script with python