diff options
| author | lorilee <leelorik@gmail.com> | 2010-07-21 00:04:03 +0400 |
|---|---|---|
| committer | lorilee <leelorik@gmail.com> | 2010-07-21 00:04:03 +0400 |
| commit | 2ebf96d242f4ce2703c9eebe808eeb10f488cd82 (patch) | |
| tree | 0683ab777852a8cbd868ee0adbaf062045f68203 /server_import.php | |
| parent | 8397112a675534e7192a2273e22531336d7b7477 (diff) | |
| parent | 2fe1c8242648139381634dd7c95fe39e69f8d5fa (diff) | |
Merge branch 'master' of git://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin
Conflicts:
libraries/display_export.lib.php
libraries/display_import.lib.php
Diffstat (limited to 'server_import.php')
| -rw-r--r-- | server_import.php | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/server_import.php b/server_import.php index bbd6cf7f11..e0eb68479e 100644 --- a/server_import.php +++ b/server_import.php @@ -2,7 +2,6 @@ /* vim: set expandtab sw=4 ts=4 sts=4: */ /** * - * @version $Id$ * @package phpMyAdmin */ |