Fix Rubocop conflict

tmilewski · tmilewski · commit 06f71d34b60e · 2017-11-21T11:09:39.000-05:00
diff --git a/.rubocop.yml b/.rubocop.yml
@@ -41,12 +41,8 @@ Style/StderrPuts:
 Style/StringLiterals:
   EnforcedStyle: double_quotes
 
-<<<<<<< HEAD
-Style/TrailingCommaInLiteral:
-  EnforcedStyleForMultiline: 'comma'
-=======
 Style/TrailingCommaInArguments:
   EnforcedStyleForMultiline: comma
+
 Style/TrailingCommaInLiteral:
   EnforcedStyleForMultiline: comma
->>>>>>> f9a8a5eea4c3445c435bc84a819593f78aad9064
