fix merge issue
authorDan Vanderkam <dan@dygraphs.com>
Mon, 6 Jun 2011 13:33:55 +0000 (09:33 -0400)
committerDan Vanderkam <dan@dygraphs.com>
Mon, 6 Jun 2011 13:33:55 +0000 (09:33 -0400)
commitfac494f30a31bb8fff4d688c4b9964cbc8741318
treed753fe0aca766ae8cb360b040a2c14e3ec995aaa
parent408ae4df9c06ce2fc75737bfd97fb1dae1f4aa49
fix merge issue
dygraph-canvas.js