Fix merge conflicts

2012-09-09 07:35:38 -04:00 · 2012-09-09 07:35:38 -04:00 · e491ab1c8a
commit e491ab1c8a
parent 467cd60a00
1 changed files with 1 additions and 1 deletions
--- a/js/tbl_chart.js
+++ b/js/tbl_chart.js
@ -47,7 +47,7 @@ $(function() {
            yaxis: {
                label: $('input[name="yaxis_label"]').val(),
                labelRenderer: $.jqplot.CanvasAxisLabelRenderer
-            },
+            }
        },
        title: {
            text: $('input[name="chartTitle"]').attr('value')