Merged conflict test

This commit is contained in:
Emily 2019-02-25 16:31:58 +01:00
commit dfe81abec5
2 changed files with 15 additions and 0 deletions

View File

@ -9,3 +9,8 @@ def home():
@glob.app.route("/regninger")
def serve_regninger():
return render_template("regninger.html")
@glob.app.route("/kvittering")
def serve_kvittering():
return render_template("kvittering.html")

10
templates/kvittering.html Normal file
View File

@ -0,0 +1,10 @@
{% set title = "Kvitteringer" %}
{% extends "layout/bootstrap.html" %}
{% block content %}
<p>Tester siden!</p>
<p>KVITTERINGER FOR FAEN!</p>
{% endblock %}