[phpMyAdmin Git] [phpmyadmin/phpmyadmin] af0267: Fix merge error - 2efeb1185d3a37abea9819474fed291ca0ac8ce1

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: af026702e104a9a2810bd84f0a21ab9ac96369aa https://github.com/phpmyadmin/phpmyadmin/commit/af026702e104a9a2810bd84f0a2… Author: William Desportes <williamdes(a)wdes.fr> Date: 2019-10-21 (Mon, 10 October 2019) +02:00 Changed paths: M themes/original/scss/_common.scss M themes/pmahomme/scss/_common.scss Log Message: ----------- Fix merge error - 2efeb1185d3a37abea9819474fed291ca0ac8ce1 Signed-off-by: William Desportes <williamdes(a)wdes.fr> Commit: 75753cd65a1a6791d22723cc4dc9a020ddaacd39 https://github.com/phpmyadmin/phpmyadmin/commit/75753cd65a1a6791d22723cc4dc… Author: William Desportes <williamdes(a)wdes.fr> Date: 2019-10-21 (Mon, 10 October 2019) +02:00 Changed paths: M themes/original/scss/_common.scss M themes/pmahomme/scss/_common.scss Log Message: ----------- Merge branch 'QA_5_0' Signed-off-by: William Desportes <williamdes(a)wdes.fr>