From ad93c5c3ab7d3b85b66e5ef4643c65a80a27a795 Mon Sep 17 00:00:00 2001
From: Damian Mooyman <damian@silverstripe.com>
Date: Tue, 21 Apr 2015 19:26:27 +1200
Subject: [PATCH] Fix merge conflict

---
 code/extensions/CommentsExtension.php | 2 +-
 css/{Comments.css => cms.css}         | 0
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename css/{Comments.css => cms.css} (100%)

diff --git a/code/extensions/CommentsExtension.php b/code/extensions/CommentsExtension.php
index 0d19105..86554f8 100644
--- a/code/extensions/CommentsExtension.php
+++ b/code/extensions/CommentsExtension.php
@@ -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();
 
diff --git a/css/Comments.css b/css/cms.css
similarity index 100%
rename from css/Comments.css
rename to css/cms.css