From 0791b6b5ae04a6b1bb13ef8e32dc07227b7b4c27 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= <michal@cihar.com>
Date: Wed, 5 Sep 2012 07:10:46 +0200
Subject: [PATCH 1/2] Fix unresolved merge conflict

---
 server_status.php | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/server_status.php b/server_status.php
index 2b49d278a9..ed936b6cb9 100644
--- a/server_status.php
+++ b/server_status.php
@@ -134,23 +134,11 @@ if (isset($_REQUEST['ajax_request']) && $_REQUEST['ajax_request'] == true) {
                                 $cpuload = $sysinfo->loadavg();
                             }
 
-<<<<<<< HEAD
-                            if (PHP_OS == 'Linux') {
-                                $ret[$chart_id][$node_id][$point_id]['idle']
-                                    = $cpuload['idle'];
-                                $ret[$chart_id][$node_id][$point_id]['busy']
-                                    = $cpuload['busy'];
-                            } else {
-                                $ret[$chart_id][$node_id][$point_id]['value']
-                                    = $cpuload['loadavg'];
-                            }
-=======
                             if (PMA_getSysInfoOs() == 'Linux') {
                                 $ret[$chart_id][$node_id][$point_id]['idle'] = $cpuload['idle'];
                                 $ret[$chart_id][$node_id][$point_id]['busy'] = $cpuload['busy'];
                             } else
                                 $ret[$chart_id][$node_id][$point_id]['value'] = $cpuload['loadavg'];
->>>>>>> QA_3_5
 
                             break;
 

From e9ba7339a7d1043603527ffad2302f3159e8d8d0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= <michal@cihar.com>
Date: Wed, 5 Sep 2012 07:11:18 +0200
Subject: [PATCH 2/2] Coding style improvements

---
 server_status.php | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/server_status.php b/server_status.php
index ed936b6cb9..56953dd8a4 100644
--- a/server_status.php
+++ b/server_status.php
@@ -135,10 +135,14 @@ if (isset($_REQUEST['ajax_request']) && $_REQUEST['ajax_request'] == true) {
                             }
 
                             if (PMA_getSysInfoOs() == 'Linux') {
-                                $ret[$chart_id][$node_id][$point_id]['idle'] = $cpuload['idle'];
-                                $ret[$chart_id][$node_id][$point_id]['busy'] = $cpuload['busy'];
-                            } else
-                                $ret[$chart_id][$node_id][$point_id]['value'] = $cpuload['loadavg'];
+                                $ret[$chart_id][$node_id][$point_id]['idle'] =
+                                    $cpuload['idle'];
+                                $ret[$chart_id][$node_id][$point_id]['busy'] =
+                                    $cpuload['busy'];
+                            } else {
+                                $ret[$chart_id][$node_id][$point_id]['value'] =
+                                    $cpuload['loadavg'];
+                            }
 
                             break;