Fixed conflict due to upstream merge

This commit is contained in:
ninadsp
2010-07-23 21:59:15 +05:30
331 changed files with 127280 additions and 132228 deletions

View File

@@ -1,7 +1,6 @@
<?php
/* vim: set expandtab sw=4 ts=4 sts=4: */
/**
* @version $Id$
* @package phpMyAdmin-Designer
*/