diff options
Diffstat (limited to 'forum/templatetags/extra_tags.py')
| -rw-r--r-- | forum/templatetags/extra_tags.py | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/forum/templatetags/extra_tags.py b/forum/templatetags/extra_tags.py index 8ed79d3c..b2199284 100644 --- a/forum/templatetags/extra_tags.py +++ b/forum/templatetags/extra_tags.py @@ -251,11 +251,7 @@ def diff_date(date, limen=2): return _('2 days ago') elif days == 1: return _('yesterday') -<<<<<<< HEAD:forum/templatetags/extra_tags.py - elif minutes > 60: -======= elif minutes >= 60: ->>>>>>> 82d35490db90878f013523c4d1a5ec3af2df8b23:forum/templatetags/extra_tags.py return ungettext('%(hr)d hour ago','%(hr)d hours ago',hours) % {'hr':hours} else: return ungettext('%(min)d min ago','%(min)d mins ago',minutes) % {'min':minutes} @@ -336,13 +332,8 @@ class BlockResourceNode(template.Node): for item in self.items: bit = item.render(context) out += bit -<<<<<<< HEAD:forum/templatetags/extra_tags.py - out = out.replace(' ','') - return os.path.normpath(out) + '?v=%d' % settings.RESOURCE_REVISION -======= out = os.path.normpath(out) + '?v=%d' % settings.RESOURCE_REVISION return out.replace(' ','') ->>>>>>> 82d35490db90878f013523c4d1a5ec3af2df8b23:forum/templatetags/extra_tags.py @register.tag(name='blockresource') def blockresource(parser,token): |