From e491ab1c8accfdf40761ced5a96969c48143dc3f Mon Sep 17 00:00:00 2001
From: Marc Delisle <marc@infomarc.info>
Date: Sun, 9 Sep 2012 07:35:38 -0400
Subject: [PATCH] Fix merge conflicts

---
 js/tbl_chart.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/js/tbl_chart.js b/js/tbl_chart.js
index 783eb46cde..1da2e0445d 100644
--- 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')