User: alexb Branch: DRUPAL-6--2 Date: Tue, 29 Sep 2009 18:47:12 +0000 Modified files: /modules/feedapi_mapper feedapi_mapper.admin.inc feedapi_mapper.module /modules/feedapi_mapper/tests feedapi_mapper.test Log message: #557500 Aron Novak, alex_b: Resolve naming conflict 'override per content type setting' and 'override default'. Links: http://cvs.drupal.org/diff.php?path=contributions/modules/feedapi_mapper/fee... http://cvs.drupal.org/diff.php?path=contributions/modules/feedapi_mapper/fee... http://cvs.drupal.org/diff.php?path=contributions/modules/feedapi_mapper/tes...