Resolving merge failure

MortalreminderPT · Apr 13, 2024 · 36e5461 · 36e5461
1 parent 07a4cdb
commit 36e5461
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 1 deletion.
diff --git a/.gitignore b/.gitignore
@@ -7,4 +7,5 @@
 !/resources/new.xlsx
 !/tests/xlsx/*.xlsx
 #*.bat
-/examples/demo.rs
+/examples/demo.rs
+!/tests/output/
diff --git a/examples/pics/capybara.bmp b/examples/pics/capybara.bmp
diff --git a/examples/read_and_copy.rs b/examples/read_and_copy.rs
@@ -14,6 +14,7 @@ fn main() -> WorkbookResult<()> {
 
     // Synchronous column width and format
     let columns_map = reading_sheet.get_columns_with_format("A:XFD")?;
+    writing_sheet.set_default_column(reading_sheet.get_default_column());
     columns_map.iter().for_each(|(col_range, (column, format))| {
         if let Some(format) = format {
             // if col format exists, write it to writing_sheet

diff --git a/tests/output/capybara.png b/tests/output/capybara.png