From: Ant Zucaro Date: Thu, 5 Sep 2013 18:58:24 +0000 (-0400) Subject: Fix merge conflicts. X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=a3de30c241d2c2abda93bdaabf59c04475ef2381;p=xonotic%2Fxonstat.git Fix merge conflicts. --- a3de30c241d2c2abda93bdaabf59c04475ef2381 diff --cc xonstat/templates/nvd3_damage.mako index 9b3accb,363cfc4..d612922 --- a/xonstat/templates/nvd3_damage.mako +++ b/xonstat/templates/nvd3_damage.mako @@@ -13,75 -22,33 +22,86 @@@ text font: 12px sans-serif; } - #damageChartSVG, #chart2 { + #damageChartSVG { height: 500px; } - - - -
- -
+ + ++ + <%block name="js"> + ${parent.js()} + + - + + +
+
+ +
+ +
+ +
+