zed-industries/zed
1
1
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2024-11-08 07:35:01 +03:00
Code Issues Packages Projects Releases Wiki Activity

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