mirror of https://github.com/helix-editor/helix
fix: merge conflict
parent
77eb2f95e8
commit
9fe397bd79
|
@ -22,6 +22,7 @@ pub use completion::Completion;
|
||||||
pub use editor::EditorView;
|
pub use editor::EditorView;
|
||||||
pub use file_explorer::file_explorer;
|
pub use file_explorer::file_explorer;
|
||||||
use helix_stdx::rope;
|
use helix_stdx::rope;
|
||||||
|
use helix_view::theme::Style;
|
||||||
pub use markdown::Markdown;
|
pub use markdown::Markdown;
|
||||||
pub use menu::Menu;
|
pub use menu::Menu;
|
||||||
pub use picker::{Column as PickerColumn, FileLocation, Picker};
|
pub use picker::{Column as PickerColumn, FileLocation, Picker};
|
||||||
|
|
Loading…
Reference in New Issue