Fix merge conflicts.
authorAnt Zucaro <azucaro@gmail.com>
Thu, 5 Sep 2013 18:58:24 +0000 (14:58 -0400)
committerAnt Zucaro <azucaro@gmail.com>
Thu, 5 Sep 2013 18:58:24 +0000 (14:58 -0400)
commita3de30c241d2c2abda93bdaabf59c04475ef2381
treee19d248adda493a9c5df44f5b5ffe35634bdb704
parentcea8860182962524d98ba686be53c125c3cf969d
parentb8eb63bddc89ebd6cdc53b160250e6a2c2774b5d
Fix merge conflicts.
xonstat/templates/nvd3_damage.mako