Fixed conflict due to upstream merge
This commit is contained in:
@@ -1,7 +1,6 @@
|
||||
<?php
|
||||
/* vim: set expandtab sw=4 ts=4 sts=4: */
|
||||
/**
|
||||
* @version $Id$
|
||||
* @package phpMyAdmin-Designer
|
||||
*/
|
||||
|
||||
|
Reference in New Issue
Block a user