Merged conflict test
This commit is contained in:
commit
dfe81abec5
|
@ -9,3 +9,8 @@ def home():
|
||||||
@glob.app.route("/regninger")
|
@glob.app.route("/regninger")
|
||||||
def serve_regninger():
|
def serve_regninger():
|
||||||
return render_template("regninger.html")
|
return render_template("regninger.html")
|
||||||
|
|
||||||
|
@glob.app.route("/kvittering")
|
||||||
|
def serve_kvittering():
|
||||||
|
return render_template("kvittering.html")
|
||||||
|
|
||||||
|
|
10
templates/kvittering.html
Normal file
10
templates/kvittering.html
Normal file
|
@ -0,0 +1,10 @@
|
||||||
|
{% set title = "Kvitteringer" %}
|
||||||
|
|
||||||
|
{% extends "layout/bootstrap.html" %}
|
||||||
|
|
||||||
|
{% block content %}
|
||||||
|
|
||||||
|
<p>Tester siden!</p>
|
||||||
|
<p>KVITTERINGER FOR FAEN!</p>
|
||||||
|
|
||||||
|
{% endblock %}
|
Loading…
Reference in New Issue
Block a user