aboutsummaryrefslogtreecommitdiff
path: root/helix-view/src/editor.rs
diff options
context:
space:
mode:
authorJan Hrastnik2021-06-16 15:08:46 +0000
committerJan Hrastnik2021-06-16 15:08:46 +0000
commit9c419fe05cd51c96df29ac02e3dc5c73cae4ef97 (patch)
tree76ff55b9e16da5122787092c66ceb7613f39bc9b /helix-view/src/editor.rs
parent5eb69183926ab2f781aa08abf587ba338027854b (diff)
added more changes from pr review for line_ending_detection
Diffstat (limited to 'helix-view/src/editor.rs')
-rw-r--r--helix-view/src/editor.rs4
1 files changed, 0 insertions, 4 deletions
diff --git a/helix-view/src/editor.rs b/helix-view/src/editor.rs
index c7e1fea7..24f43c0e 100644
--- a/helix-view/src/editor.rs
+++ b/helix-view/src/editor.rs
@@ -8,13 +8,9 @@ use slotmap::SlotMap;
use anyhow::Error;
-<<<<<<< HEAD
pub use helix_core::diagnostic::Severity;
pub use helix_core::register::Registers;
use helix_core::Position;
-=======
-pub use helix_core::{diagnostic::Severity, LineEnding};
->>>>>>> 491a8b3 (resolved conflict in rebase)
#[derive(Debug)]
pub struct Editor {