gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix merge conflicts

Browse Source
This commit is contained in:
Marc Delisle 2012-09-09 06:40:05 -04:00
parent 08eb5ef035
commit 89c60cbbef
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
js/server_status.js
View File

@ -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.
}
};