User: yched Branch: HEAD Date: Fri, 16 Mar 2007 16:20:39 +0000 Modified files: /modules/cck content_admin.inc Log message: #116775 - stupid conflict on field form when field_name == 'name' :-) - Thanks BioALIEN, jimyhuang, sentinelcz Links: http://cvs.drupal.org/diff.php?path=contributions/modules/cck/content_admin....