From 1a02521f76e9c9f31e195555e7519ef614f6fed6 Mon Sep 17 00:00:00 2001
From: Serghey Rodin <serghey.rodin@gmail.com>
Date: Thu, 8 Aug 2019 14:13:35 +0300
Subject: [PATCH] Resolved merge conflict with tmp dir.

---
 install/rhel/7/pma/config.inc.conf | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/install/rhel/7/pma/config.inc.conf b/install/rhel/7/pma/config.inc.conf
index 25097ecaf..8f3e0a7b5 100644
--- a/install/rhel/7/pma/config.inc.conf
+++ b/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'.