Fixed some merge conflicts with the elmarkou updates. Minor conflicts, we both fixed spelling and grammar mistakes at the same time :-)

This commit is contained in:
rembo10
2012-05-22 17:39:32 +05:30
5 changed files with 16 additions and 5 deletions

View File

@@ -1,4 +1,4 @@
lossless<%inherit file="base.html" />
<%inherit file="base.html" />
<%!
import headphones
from headphones.helpers import checked