Core/grin
0
0
Fork 0
mirror of https://github.com/mimblewimble/grin.git synced 2025-01-20 19:11:08 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Trying to fix slight snafu

Browse source
This commit is contained in:
Ignotus Peverell 2018-12-11 01:09:28 +00:00
parent 1be37870a2
commit 725499bbf0
No known key found for this signature in database
GPG key ID: 99CD25F39F8F8211
1 changed files with 0 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
etc/gen_gen/src/bin/gen_gen.rs
View file

@ -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;