Trying to fix slight snafu

2018-12-11 01:09:11 +00:00
parent a58235f603 3e7bc2888c
commit 1be37870a2
1 changed files with 5 additions and 0 deletions
@@ -17,8 +17,13 @@
 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;