Fix merge conflict, change indentation a bit.
authorAnt Zucaro <azucaro@gmail.com>
Sat, 16 Jun 2012 15:41:48 +0000 (11:41 -0400)
committerAnt Zucaro <azucaro@gmail.com>
Sat, 16 Jun 2012 15:41:48 +0000 (11:41 -0400)
commitac531417765e217e7633f4e2ba00583305f6fec7
treeb7b2a3f973e0c58c913327228b57c395fe7e7d85
parent0835a3714ab9340d91688e3585118d8269fc24f5
parent3ed0332b503a656ce1e3d8dc16a5c3ef867d76c9
Fix merge conflict, change indentation a bit.
xonstat/__init__.py
xonstat/views/__init__.py
xonstat/views/player.py