Skip to content
Permalink
Browse files

deleted merge artifacts

  • Loading branch information...
serghey-rodin committed Aug 8, 2019
1 parent 02955dd commit 8728f4b00d77b2395ce2199f06858ad1f5bef390
Showing with 0 additions and 2 deletions.
  1. +0 −2 install/rhel/7/pma/config.inc.conf
@@ -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;

0 comments on commit 8728f4b

Please sign in to comment.
You can’t perform that action at this time.