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 %}