github/vesta
1
0
Fork 0
mirror of https://github.com/serghey-rodin/vesta.git synced 2025-08-21 05:44:07 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

deleted merge artifacts

Browse source
This commit is contained in:
Serghey Rodin 2019-08-08 14:20:35 +03:00
commit 8728f4b00d
1 changed files with 0 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
install/rhel/7/pma/config.inc.conf
View file

@ -16,7 +16,6 @@
*/
$cfg['blowfish_secret'] = '%blowfish_secret%'; /* YOU MUST FILL IN THIS FOR COOKIE AUTH! */
<<<<<<< HEAD
/**
=======
/*
@ -26,7 +25,6 @@ $cfg['blowfish_secret'] = '%blowfish_secret%'; /* YOU MUST FILL IN THIS FOR COOK
$cfg['TempDir'] = '/tmp';
/*
>>>>>>> Update config.inc.conf
* Servers configuration
*/
$i = 0;