From 6269337c1e14063ffe1e3fa982c30e6763d191c5 Mon Sep 17 00:00:00 2001
From: Joe Rayhawk <jrayhawk@farfotzle.omgwallhack.org>
Date: Sun, 8 Aug 2010 16:07:05 -0700
Subject: Removing unmodified templates; Ikiwiki will fall back to defaults.

---
 srv/templates/editconflict.tmpl | 7 -------
 1 file changed, 7 deletions(-)
 delete mode 100644 srv/templates/editconflict.tmpl

(limited to 'srv/templates/editconflict.tmpl')

diff --git a/srv/templates/editconflict.tmpl b/srv/templates/editconflict.tmpl
deleted file mode 100644
index 1252033..0000000
--- a/srv/templates/editconflict.tmpl
+++ /dev/null
@@ -1,7 +0,0 @@
-<p class="error">
-<b>Your changes conflict with other changes made to the page.</b>
-</p>
-<p>
-Conflict markers have been inserted into the page content. Reconcile the
-conflict and commit again to save your changes.
-</p>
-- 
cgit v1.2.3