From eff5d0c9d4fc2d3a0cbaf139d691f861e190c7d6 Mon Sep 17 00:00:00 2001
From: Dmitriy Smirnov <dmitriy.smirnov@jetbrains.com>
Date: Thu, 11 Jul 2019 20:48:32 +0300
Subject: [PATCH] vcs: Remove obsolete setting from Find Action

The setting was removed in 5ed8cf92. Fixes IDEA-217856

GitOrigin-RevId: 6153cf106e98a887095fde96656e20e8e81b1948
---
 .../openapi/vcs/configurable/VcsOptionsTopHitProvider.java       | 1 -
 1 file changed, 1 deletion(-)

diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/configurable/VcsOptionsTopHitProvider.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/configurable/VcsOptionsTopHitProvider.java
index d3571e6961f6..26096c9c1dc9 100644
--- a/platform/vcs-impl/src/com/intellij/openapi/vcs/configurable/VcsOptionsTopHitProvider.java
+++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/configurable/VcsOptionsTopHitProvider.java
@@ -78,7 +78,6 @@ public final class VcsOptionsTopHitProvider implements OptionsSearchTopHitProvid
 
     if (!project.isDefault()) {
       // process Version Control / Changelist Conflicts settings
-      options.add(tracker(project, "Changelists: Enable changelist conflict tracking", "TRACKING_ENABLED"));
       options.add(tracker(project, "Changelists: Show conflict resolving dialog", "SHOW_DIALOG"));
       options.add(tracker(project, "Changelists: Highlight files with conflicts", "HIGHLIGHT_CONFLICTS"));
       options.add(tracker(project, "Changelists: Highlight files from non-active changelists", "HIGHLIGHT_NON_ACTIVE_CHANGELIST"));