Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: f1375a26a3c543d28621b7901d0433c0069004ab https://github.com/phpmyadmin/phpmyadmin/commit/f1375a26a3c543d28621b7901d04... Author: Isaac Bennetch bennetch@gmail.com Date: 2017-01-17 (Tue, 17 Jan 2017)

Changed paths: M libraries/insert_edit.lib.php

Log Message: ----------- Remove dead code related to 4a2695c

Signed-off-by: Isaac Bennetch bennetch@gmail.com

Commit: e1276e8eb46916ef2e8458fbd9c099fb0bf85a97 https://github.com/phpmyadmin/phpmyadmin/commit/e1276e8eb46916ef2e8458fbd9c0... Author: Isaac Bennetch bennetch@gmail.com Date: 2017-01-17 (Tue, 17 Jan 2017)

Changed paths: M libraries/insert_edit.lib.php

Log Message: ----------- Fix merge conflicts removing dead code

Signed-off-by: Isaac Bennetch bennetch@gmail.com

Compare: https://github.com/phpmyadmin/phpmyadmin/compare/5c3f74d8753d...e1276e8eb469