Set default highlight theme

zineland · May 5, 2022 · 9020c19 · 9020c19
1 parent fd8c8ec
commit 9020c19
Showing 1 changed file with 0 additions and 10 deletions.
diff --git a/src/entity/markdown.rs b/src/entity/markdown.rs
@@ -3,19 +3,15 @@ use serde::Deserialize;
 #[derive(Debug, Deserialize, Clone)]
 #[serde(rename_all(deserialize = "snake_case"))]
 pub struct MarkdownConfig {
-<<<<<<< HEAD
     #[serde(default = "MarkdownConfig::default_highlight_code")]
     pub highlight_code: bool,
     #[serde(default = "MarkdownConfig::default_highlight_theme")]
-=======
->>>>>>> Support customize highlight theme
     pub highlight_theme: String,
 }
 
 impl Default for MarkdownConfig {
     fn default() -> Self {
         Self {
-<<<<<<< HEAD
             highlight_code: true,
             highlight_theme: Self::default_highlight_theme(),
         }
@@ -33,9 +29,3 @@ impl MarkdownConfig {
         true
     }
 }
-=======
-            highlight_theme: String::from("monokai"),
-        }
-    }
-}
->>>>>>> Support customize highlight theme