fix conflict
This commit is contained in:
parent
3529717476
commit
ff4d40cdd4
1 changed files with 1 additions and 1 deletions
|
|
@ -54,7 +54,7 @@ use crate::{
|
||||||
config::{IconSizes, TabConfig, ICON_SCALE_MAX, ICON_SIZE_GRID},
|
config::{IconSizes, TabConfig, ICON_SCALE_MAX, ICON_SIZE_GRID},
|
||||||
dialog::DialogKind,
|
dialog::DialogKind,
|
||||||
fl,
|
fl,
|
||||||
localize::LANGUAGE_SORTER,
|
localize::{LANGUAGE_CHRONO, LANGUAGE_SORTER},
|
||||||
menu,
|
menu,
|
||||||
mime_app::{mime_apps, MimeApp},
|
mime_app::{mime_apps, MimeApp},
|
||||||
mime_icon::{mime_for_path, mime_icon},
|
mime_icon::{mime_for_path, mime_icon},
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue