From 3b68215be793774fafd9ce124a2065f5968f50e5 Mon Sep 17 00:00:00 2001
From: Xu Cheng <xucheng@me.com>
Date: Mon, 3 Aug 2015 16:42:42 +0800
Subject: [PATCH] rubocop: remove conflicted rules

Since trailing commas in method argument lists are a syntax error in
1.8, let's enforce the default rule of `TrailingComma`(i.e. `no_comma`)

Closes Homebrew/homebrew#42398.

Signed-off-by: Xu Cheng <xucheng@me.com>
---
 Library/.rubocop.yml | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/Library/.rubocop.yml b/Library/.rubocop.yml
index df5c5a9d94..2bf506a4b8 100644
--- a/Library/.rubocop.yml
+++ b/Library/.rubocop.yml
@@ -74,10 +74,6 @@ Style/PercentLiteralDelimiters:
         '%W': '[]'
         '%x': '()'
 
-# comma on last element is editor friendly
-Style/TrailingComma:
-    EnforcedStyleForMultiline: comma
-
 # conflicts with DSL-style path concatenation with `/`
 Style/SpaceAroundOperators:
     Enabled: false
@@ -123,10 +119,6 @@ Style/TrailingBlankLines:
 Style/SignalException:
   EnforcedStyle: only_raise
 
-# trailing commas in method argument lists are a syntax error in 1.8
-Style/TrailingComma:
-  Enabled: false
-
 # we prefer compact if-else-end/case-when-end alignment
 Lint/EndAlignment:
   AlignWith: variable