From 4959a095c4022bcedda913e6ab6eb7a44352f030 Mon Sep 17 00:00:00 2001
From: Chris Jones <chris@brack3t.com>
Date: Thu, 18 Jul 2013 17:44:19 -0700
Subject: [PATCH] fix merge error.

---
 .../templates/djadmin2theme_default/model_history.html          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/djadmin2/themes/djadmin2theme_default/templates/djadmin2theme_default/model_history.html b/djadmin2/themes/djadmin2theme_default/templates/djadmin2theme_default/model_history.html
index f68ad8d..e6534b2 100644
--- a/djadmin2/themes/djadmin2theme_default/templates/djadmin2theme_default/model_history.html
+++ b/djadmin2/themes/djadmin2theme_default/templates/djadmin2theme_default/model_history.html
@@ -47,7 +47,7 @@
             <tr>
                 <td>{{ log.action_time }}</td>
                 <td>{{ log.user }}</td>
-                <td>{{ log.action_flag }}</td>
+                <td>{{ log.action_type|capfirst }}</td>
                 <td>{{ log.change_message }}</td>
             </tr>
             {% endfor %}