1 files changed, 6 insertions, 4 deletions
diff --git a/helix-view/src/editor.rs b/helix-view/src/editor.rs
index d7205fbd..c7e1fea7 100644
--- a/helix-view/src/editor.rs
+++ b/helix-view/src/editor.rs
@@ -1,6 +1,4 @@
-use crate::{
-    theme::Theme, tree::Tree, Document, DocumentId, LineEnding, RegisterSelection, View, ViewId,
-};
+use crate::{theme::Theme, tree::Tree, Document, DocumentId, RegisterSelection, View, ViewId};
 use tui::layout::Rect;
 use tui::terminal::CursorKind;
 
@@ -10,9 +8,13 @@ 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 {
@@ -150,7 +152,7 @@ impl Editor {
 
     pub fn new_file(&mut self, action: Action) -> DocumentId {
         use helix_core::Rope;
-        let doc = Document::new(Rope::from("\n"), LineEnding::LF);
+        let doc = Document::new(Rope::from("\n"));
         let id = self.documents.insert(doc);
         self.documents[id].id = id;
         self.switch(id, action);