tonyair
/
silverstripe-comments
mirror of https://github.com/silverstripe/silverstripe-comments
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
code/extensions/CommentsExtension.php
View File

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

0
css/Comments.css → css/cms.css
View File