Fix merge conflict

This commit is contained in:
Damian Mooyman 2015-04-21 19:26:27 +12:00
parent 298ac89ad6
commit ad93c5c3ab
2 changed files with 1 additions and 1 deletions

View File

@ -475,7 +475,7 @@ class CommentsExtension extends DataExtension {
* @param FieldList $fields
*/
protected function updateModerationFields(FieldList $fields) {
Requirements::css(COMMENTS_DIR . '/css/Comments.css');
Requirements::css(COMMENTS_DIR . '/css/cms.css');
$commentsConfig = CommentsGridFieldConfig::create();