From a745eb02d8e6b0719f538c8504128ec70d617390 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Luka=20Paunovi=C4=87?= <office@leo-host.com>
Date: Thu, 21 Mar 2019 18:14:51 +0100
Subject: [PATCH] Update config.inc.conf

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

diff --git a/install/rhel/7/pma/config.inc.conf b/install/rhel/7/pma/config.inc.conf
index 8f3e0a7b5..d2ab6946e 100644
--- a/install/rhel/7/pma/config.inc.conf
+++ b/install/rhel/7/pma/config.inc.conf
@@ -16,7 +16,17 @@
  */
 $cfg['blowfish_secret'] = '%blowfish_secret%'; /* YOU MUST FILL IN THIS FOR COOKIE AUTH! */
 
+<<<<<<< HEAD
 /**
+=======
+/*
+ * Temp dir for faster beahivour
+ *
+ */
+$cfg['TempDir']  = '/tmp';
+
+/*
+>>>>>>> Update config.inc.conf
  * Servers configuration
  */
 $i = 0;