From 8631c39610ba755bd78e0f6ca48d2e8b179ce9ca Mon Sep 17 00:00:00 2001
From: Ross Chapman <rosschapman@users.noreply.github.com>
Date: Wed, 27 Sep 2023 17:54:08 -0700
Subject: [PATCH] Fix bad merge

---
 .rubocop.yml | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/.rubocop.yml b/.rubocop.yml
index 38ce4995f..3d05101d7 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -37,6 +37,3 @@ Style/TrailingCommaInArrayLiteral:
 Rails/CreateTableWithTimestamps:
   Exclude:
     - db/schema.rb
-
-Capybara/ClickLinkOrButtonStyle:
-  EnforcedStyle: link_or_button