diff options
| author | ninadsp <ninadsp16289@gmail.com> | 2010-07-23 20:29:15 +0400 |
|---|---|---|
| committer | ninadsp <ninadsp16289@gmail.com> | 2010-07-23 20:29:15 +0400 |
| commit | e646a2760c65204894cb96a7cce61469bee5b9e3 (patch) | |
| tree | 323f49566513965362b5e51b58a57f6716791daf /server_sql.php | |
| parent | 13ec1423f61e613e653872f3066ca7c9032306d1 (diff) | |
| parent | 049886139c62c3ed8b6573a0637ec5516857661f (diff) | |
Fixed conflict due to upstream merge
Diffstat (limited to 'server_sql.php')
| -rwxr-xr-x | server_sql.php | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/server_sql.php b/server_sql.php index 024087a9d8..9ed1e3e7e4 100755 --- a/server_sql.php +++ b/server_sql.php @@ -2,7 +2,6 @@ /* vim: set expandtab sw=4 ts=4 sts=4: */ /** * - * @version $Id$ * @package phpMyAdmin */ |