Yehowshua/ZIm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Wire in conflict styling

Browse source
This commit is contained in:
Mikayla Maki 2023-05-22 10:10:47 -07:00
parent a355b4c135
commit ef81813d56
No known key found for this signature in database
1 changed files with 1 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
crates/project_panel/src/project_panel.rs
View file

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