[phpMyAdmin Git] [phpmyadmin/phpmyadmin] f1375a: Remove dead code related to 4a2695c

[Isaac Bennetch]

  Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: f1375a26a3c543d28621b7901d0433c0069004ab
      https://github.com/phpmyadmin/phpmyadmin/commit/f1375a26a3c543d28621b7901d0433c0069004ab
  Author: Isaac Bennetch <bennetch at 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 at gmail.com>


  Commit: e1276e8eb46916ef2e8458fbd9c099fb0bf85a97
      https://github.com/phpmyadmin/phpmyadmin/commit/e1276e8eb46916ef2e8458fbd9c099fb0bf85a97
  Author: Isaac Bennetch <bennetch at 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 at gmail.com>


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