WIP#463

2022-10-04 01:16:34 +09:00
parent 9c97c24698
commit 4bb2cf1a89
4 changed files with 18 additions and 22 deletions
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -6,8 +6,5 @@ pub mod omikuji;
 pub mod options;
 pub mod timeline;
 pub mod yaml;
-<<<<<<< HEAD
-=======
 #[macro_use]
 extern crate horrorshow;
->>>>>>> d91fd31392813c79a33cf5dc10eae06db2ce2613