Fix conflict.
authorwww-data <www-data@mail.holoscopio.com>
Sun, 30 Sep 2007 12:04:18 +0000 (09:04 -0300)
committerwww-data <www-data@mail.holoscopio.com>
Sun, 30 Sep 2007 12:04:18 +0000 (09:04 -0300)
commit1512191b2a85db8f56ad0be78c6a5bac014e9772
treed341208d3c08b42d8f65c600cc4c637ddb042eb9
parente2716c678f6623eb19e5cbde82590ad1e1f1a903
Fix conflict.
views.py