[phpMyAdmin Git] [phpmyadmin/phpmyadmin] 3236ae: Fix merge error - 7075cb0a41007030f48c549d0085f990405915c0

[William Desportes]

Branch: refs/heads/QA_5_0
Home: https://github.com/phpmyadmin/phpmyadmin
Commit: 3236ae281bb516389d90d59484b0dfcb954622de
https://github.com/phpmyadmin/phpmyadmin/commit/3236ae281bb516389d90d59484b0dfcb954622de
Author: William Desportes <williamdes at wdes.fr>
Date: 2019-10-21 (Mon, 10 October 2019) +02:00

Changed paths: 
M js/designer/move.js

Log Message:
-----------
Fix merge error - 7075cb0a41007030f48c549d0085f990405915c0

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