diff options
author | lorilee <leelorik@gmail.com> | 2010-07-27 00:42:42 +0400 |
---|---|---|
committer | lorilee <leelorik@gmail.com> | 2010-07-27 00:42:42 +0400 |
commit | 2a59451ac5bb593da66d8787745f5509ec8b27fc (patch) | |
tree | d65c29b89ce18869d366d4d304393cc82eabeb8f /tbl_import.php | |
parent | 723a71c0145f4ccb91db23f878fefa203ce71ca6 (diff) | |
parent | 41bc587ed4494d21e7b69647a1235d2ca405c8ea (diff) |
Merge branch 'master' of git://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin
Conflicts:
server_export.php
Diffstat (limited to 'tbl_import.php')
-rw-r--r-- | tbl_import.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tbl_import.php b/tbl_import.php index 0a37430f0d..ff99ca85b4 100644 --- a/tbl_import.php +++ b/tbl_import.php @@ -30,6 +30,6 @@ require_once './libraries/display_import.lib.php'; /** * Displays the footer */ -require_once './libraries/footer.inc.php'; +require './libraries/footer.inc.php'; ?> |