Wire in conflict styling

Mikayla Maki created 2 years ago

Change summary

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

Detailed changes

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);