From 89c60cbbeff59827003c322c0ac3a13ef1388dea Mon Sep 17 00:00:00 2001
From: Marc Delisle <marc@infomarc.info>
Date: Sun, 9 Sep 2012 06:40:05 -0400
Subject: [PATCH] Fix merge conflicts

---
 js/server_status.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/js/server_status.js b/js/server_status.js
index c401ac83f8..b5132c002a 100644
--- a/js/server_status.js
+++ b/js/server_status.js
@@ -391,7 +391,7 @@ $(function() {
                 yaxis: {
                     autoscale:true,
                     label: PMA_messages['strTotalCount'],
-                    labelRenderer: $.jqplot.CanvasAxisLabelRenderer,
+                    labelRenderer: $.jqplot.CanvasAxisLabelRenderer
                 }
             },
             seriesDefaults: {
@@ -403,7 +403,7 @@ $(function() {
                 show: true,
                 location: 's',     // compass direction, nw, n, ne, e, se, s, sw, w.
                 xoffset: 12,        // pixel offset of the legend box from the x (or x2) axis.
-                yoffset: 12,        // pixel offset of the legend box from the y (or y2) axis.
+                yoffset: 12        // pixel offset of the legend box from the y (or y2) axis.
             }
         };