From 31b4471d7c456a249b87a38b112e90a793707c63 Mon Sep 17 00:00:00 2001 From: Matthias Seidl Date: Tue, 24 Nov 2020 23:21:04 +0100 Subject: [PATCH] added links in footer, license showing in diff --- templates/diff.html | 68 +++++++++++++++++++++++++++++++++++++++++++ templates/layout.html | 2 +- 2 files changed, 69 insertions(+), 1 deletion(-) create mode 100644 templates/diff.html diff --git a/templates/diff.html b/templates/diff.html new file mode 100644 index 0000000..1ebad2d --- /dev/null +++ b/templates/diff.html @@ -0,0 +1,68 @@ +{% extends "layout.html" %} +{% block header_addition %} + + + + + + + + +{% endblock %} +{% block content %} +
+
+ Resolve Merge Conflict +
+
+
+
+
+
+ +
+
+
+
+ + + +
+ +
+
+{% endblock %} diff --git a/templates/layout.html b/templates/layout.html index 1d32732..30ff8d9 100644 --- a/templates/layout.html +++ b/templates/layout.html @@ -52,7 +52,7 @@
{% block content %}{% endblock %}