From faff343baf40dd5163b7a04a397755572302a447 Mon Sep 17 00:00:00 2001 From: sam lovelace Date: Sun, 28 Nov 2021 03:40:18 +0000 Subject: [PATCH] fixed stupid shit --- src/lib.rs | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/lib.rs b/src/lib.rs index 2ca2b65..b2dd46b 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -30,7 +30,6 @@ pub struct Blockquote { text: String, } -<<<<<<< HEAD pub struct Link { text: String, url: Url, @@ -43,7 +42,6 @@ pub struct Image { title: Option, link: Option, } -======= pub enum Node { Header(Header), Paragraph(Vec), @@ -51,7 +49,6 @@ pub enum Node { } pub struct Document(Vec); ->>>>>>> d808ae46ad469d6024e76ad006f7b3e0832fe8cb // TODO: able take care of lists i am too drunk for this tonight