[phpMyAdmin Git] [phpmyadmin/phpmyadmin] e6d72f: Fix merge issues

[William Desportes]

Branch: refs/heads/master
Home: https://github.com/phpmyadmin/phpmyadmin
Commit: e6d72f64f9074492d87dd2ba174cde0448fbdeba
https://github.com/phpmyadmin/phpmyadmin/commit/e6d72f64f9074492d87dd2ba174cde0448fbdeba
Author: William Desportes <williamdes at wdes.fr>
Date: 2020-04-20 (Mon, 04 April 2020) +02:00

Changed paths: 
M libraries/classes/Controllers/Table/SearchController.php

Log Message:
-----------
Fix merge issues

Ref: 54e0250dae630c2760bde1b9a1d32c2008b45aaa

Signed-off-by: William Desportes <williamdes at wdes.fr>

Commit: b74b64957bb0e6f40a5d5ae688a494458ef276e9
https://github.com/phpmyadmin/phpmyadmin/commit/b74b64957bb0e6f40a5d5ae688a494458ef276e9
Author: William Desportes <williamdes at wdes.fr>
Date: 2020-04-20 (Mon, 04 April 2020) +02:00

Changed paths: 
M phpstan-baseline.neon

Log Message:
-----------
Fix phpstan-baseline.neon

Signed-off-by: William Desportes <williamdes at wdes.fr>