Resolve .rubocop.yml

b3c904a8 · Robert Speicher · 906019fa · b3c904a8
Commit b3c904a8 authored Oct 11, 2018 by Robert Speicher
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 3 deletions

.rubocop.yml .rubocop.yml +0 -3

No files found.
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -86,10 +86,7 @@ Naming/FileName:
    - JSON
    - LDAP
    - SAML
-<<<<<<< HEAD
    - SSO
-=======
->>>>>>> upstream/master
    - IO
    - HMAC
    - QA