From 8a4e79102526c953d3bebc7daf784498c9c5240f Mon Sep 17 00:00:00 2001
From: David Peter <mail@david-peter.de>
Date: Sun, 17 Oct 2021 17:10:46 +0200
Subject: [PATCH] Fix merge conflict

---
 src/export/mod.rs | 17 +----------------
 1 file changed, 1 insertion(+), 16 deletions(-)

diff --git a/src/export/mod.rs b/src/export/mod.rs
index 7b854e8..1356e9c 100644
--- a/src/export/mod.rs
+++ b/src/export/mod.rs
@@ -42,19 +42,11 @@ struct ExporterWithFilename {
 }
 
 /// Handles the management of multiple file exporters.
+#[derive(Default)]
 pub struct ExportManager {
     exporters: Vec<ExporterWithFilename>,
 }
 
-impl Default for ExportManager {
-    /// Create a new ExportManager
-    fn default() -> ExportManager {
-        ExportManager {
-            exporters: Vec::new(),
-        }
-    }
-}
-
 impl ExportManager {
     /// Add an additional exporter to the ExportManager
     pub fn add_exporter(&mut self, export_type: ExportType, filename: &str) -> Result<()> {
@@ -84,13 +76,6 @@ impl ExportManager {
     }
 }
 
-impl Default for ExportManager {
-    /// Create a new default ExportManager
-    fn default() -> Self {
-        ExportManager::new()
-    }
-}
-
 /// Write the given content to a file with the specified name
 fn write_to_file(filename: &str, content: &[u8]) -> Result<()> {
     let mut file = OpenOptions::new().write(true).open(filename)?;