# HG changeset patch
# User Madhusudan.C.S <madhusudancs@gmail.com>
# Date 1262023652 -19800
# Node ID c6557935bc285fb54d0b6af4be320fb3b5880efa
# Parent  a123369b09010eed0d905c22dae1fbb36d16e3d1# Parent  d26e46249ff708260d9c6d116d41d19bbcdfe822
Fixed a merge conflict with RSS feeds line commenting.

diff -r a123369b0901 -r c6557935bc28 project/templates/base.html