User: inadarei Branch: DRUPAL-6--1 Date: Tue, 08 Jun 2010 12:01:39 +0000 Added files: /modules/openpublish_features/op_defaults op_defaults.features.views.inc Modified files: /modules/openpublish_features/op_author op_author.defaults.inc op_author.features.inc op_author.info /modules/openpublish_features/op_defaults op_defaults.defaults.inc op_defaults.features.inc op_defaults.info Log message: resolving feature conflicts Links: http://cvs.drupal.org/diff.php?path=contributions/modules/openpublish_featur... http://cvs.drupal.org/diff.php?path=contributions/modules/openpublish_featur... http://cvs.drupal.org/diff.php?path=contributions/modules/openpublish_featur... http://cvs.drupal.org/diff.php?path=contributions/modules/openpublish_featur... http://cvs.drupal.org/diff.php?path=contributions/modules/openpublish_featur... http://cvs.drupal.org/diff.php?path=contributions/modules/openpublish_featur... http://cvs.drupal.org/diff.php?path=contributions/modules/openpublish_featur...