Fix merge conflict in user.html
authorJef van Schendel <jefvanschendel@gmail.com>
Mon, 25 Jul 2011 20:37:02 +0000 (22:37 +0200)
committerJef van Schendel <jefvanschendel@gmail.com>
Mon, 25 Jul 2011 20:37:02 +0000 (22:37 +0200)
commit00458460d9fbdcae85bef063c614ff94338ab305
tree246cdcab3d355a5aa0777bb9603d47d8df4923db
parentb1f11df07cdef805f354f2c046e146783ad4256f
parentad74472b597d6a477f6c2e747478417a52327b4b
Fix merge conflict in user.html
mediagoblin/templates/mediagoblin/user_pages/user.html