Trying to fix slight snafu

2018-12-11 01:09:28 +00:00
parent 1be37870a2
commit 725499bbf0
1 changed files with 0 additions and 5 deletions
@@ -17,13 +17,8 @@
 use std::fs;
 use std::sync::Arc;

-<<<<<<< HEAD
 use chrono::prelude::Utc;
 use chrono::Duration;
-=======
-use chrono::Duration;
-use chrono::prelude::Utc;
->>>>>>> 3e7bc2888c4f23d3a362dd777ed28a4c9ab0b5ae
 use curl;
 use serde_json;