changeset 5681:60fde500cbc2

Fixing unclean merge /me failed at merging
author Eugene Syromyatnikov <evgsyr@gmail.com>
date Fri, 04 Jun 2010 13:29:48 +0400
parents 8604ed2e370c
children bf0b4b96dcb4
files MoinMoin/action/RenamePage.py
diffstat 1 files changed, 0 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/MoinMoin/action/RenamePage.py	Fri Jun 04 02:05:33 2010 +0400
+++ b/MoinMoin/action/RenamePage.py	Fri Jun 04 13:29:48 2010 +0400
@@ -117,7 +117,6 @@
         else:
             redirect_label = _('Create redirect for renamed page?')
             subpages_html = ""
->>>>>>> other
 
         if self.show_redirect:
             redirect_html = '<tr><dd>%(redirect_label)s<input type="checkbox" name="rename_redirect" value="1" %(redirect)s></dd></tr>' % {