From 5c7d18deb7b00d74c958e3367547823dd94c21b3 Mon Sep 17 00:00:00 2001 From: Jeffrey Forman Date: Sun, 17 Apr 2011 10:10:23 -0400 Subject: [PATCH] Handle errors when trying to retrieve zone list from NS server Conflicts: binder/templates/base.htm --- binder/templates/base.htm | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/binder/templates/base.htm b/binder/templates/base.htm index 5feba79..002edfc 100644 --- a/binder/templates/base.htm +++ b/binder/templates/base.htm @@ -8,6 +8,10 @@ {% block errors %} +<<<<<<< HEAD +======= + +>>>>>>> 885b106... Handle errors when trying to retrieve zone list from NS server {% if errors %}
Errors were encountered: @@ -19,9 +23,22 @@
{{ error_context }} {% endif %} +<<<<<<< HEAD
{% endif %} {% endblock errors %} +======= + +
+{% endif %} + + + +{% endblock errors %} + +
+{% block body %} +>>>>>>> 885b106... Handle errors when trying to retrieve zone list from NS server
{% block body %}