From ef81813d569fb1d815eaba2f5aebaa7a4157610f Mon Sep 17 00:00:00 2001
From: Mikayla Maki <mikayla@zed.dev>
Date: Mon, 22 May 2023 10:10:47 -0700
Subject: [PATCH] Wire in conflict styling

---
 crates/project_panel/src/project_panel.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/crates/project_panel/src/project_panel.rs b/crates/project_panel/src/project_panel.rs
index dd28bdd73e2ec3231188690ca06309deaaa1bfab..22b6b3fd75b767a99c0a453dd531000fad4242f4 100644
--- a/crates/project_panel/src/project_panel.rs
+++ b/crates/project_panel/src/project_panel.rs
@@ -1086,7 +1086,7 @@ impl ProjectPanel {
             .map(|status| match status {
                 GitFileStatus::Added => style.status.git.inserted,
                 GitFileStatus::Modified => style.status.git.modified,
-                GitFileStatus::Conflict => style.text.color,
+                GitFileStatus::Conflict => style.status.git.conflict,
             })
             .unwrap_or(style.text.color);