From 99267b1ba7ffdf3a107127c9fe5c3d9165b29409 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bernat=20Borr=C3=A0s=20Civil?= <70479573+BernatBC@users.noreply.github.com> Date: Fri, 11 Apr 2025 16:57:19 +0200 Subject: [PATCH] Fix merge --- src/ViewModels/CommitDetail.cs | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/ViewModels/CommitDetail.cs b/src/ViewModels/CommitDetail.cs index 3a7b78aa..2d758133 100644 --- a/src/ViewModels/CommitDetail.cs +++ b/src/ViewModels/CommitDetail.cs @@ -919,11 +919,7 @@ namespace SourceGit.ViewModels private CancellationTokenSource _cancellationSource = null; private List _revisionFiles = null; private string _revisionFileSearchFilter = string.Empty; -<<<<<<< HEAD - private bool _isRevisionFileSearchSuggestionOpen = false; private Dictionary _lineCountCache = new Dictionary(); -======= private List _revisionFileSearchSuggestion = null; ->>>>>>> develop } }