From 774b49ed9f7c29e214e31547fb87a7d9391b1742 Mon Sep 17 00:00:00 2001
From: Daniel Greenfeld <pydanny@gmail.com>
Date: Sun, 19 May 2013 10:01:50 +0200
Subject: [PATCH] merge

---
 .../{model_delete_form.html => model_confirm_delete.html}       | 0
 djadmin2/views.py                                               | 2 +-
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename djadmin2/templates/admin2/bootstrap/{model_delete_form.html => model_confirm_delete.html} (100%)

diff --git a/djadmin2/templates/admin2/bootstrap/model_delete_form.html b/djadmin2/templates/admin2/bootstrap/model_confirm_delete.html
similarity index 100%
rename from djadmin2/templates/admin2/bootstrap/model_delete_form.html
rename to djadmin2/templates/admin2/bootstrap/model_confirm_delete.html
diff --git a/djadmin2/views.py b/djadmin2/views.py
index 00e261a..a8db5d5 100644
--- a/djadmin2/views.py
+++ b/djadmin2/views.py
@@ -129,5 +129,5 @@ class ModelAddFormView(AdminModel2Mixin, generic.CreateView):
 
 class ModelDeleteView(AdminModel2Mixin, generic.DeleteView):
     success_url = "../../"
-    default_template_name = "model_delete_form.html"
+    default_template_name = "model_confirm_delete.html"
     permission_type = 'delete'