Resolved merge conflict with tmp dir.

install/rhel/7/pma/config.inc.conf

@@ -74,6 +74,13 @@ $cfg['Servers'][$i]['export_templates'] = 'pma__export_templates';
 $cfg['UploadDir'] = '/var/lib/phpMyAdmin/upload';
 $cfg['SaveDir'] = '/var/lib/phpMyAdmin/save';
 
+/*
+ * Temp dir for faster beahivour
+ *
+*/
+$cfg['TempDir']  = '/tmp';
+
+
 /**
  * Whether to display icons or text or both icons and text in table row
  * action segment. Value can be either of 'icons', 'text' or 'both'.