Peerplays_Blockchain/peerplays-fc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix conflict

Browse source
This commit is contained in:
Daniel Larimer 2015-02-11 18:32:23 -05:00
parent 71e4e221b7
commit 0bf2f9cfd4
1 changed files with 0 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
include/fc/crypto/ripemd160.hpp
View file

@ -3,12 +3,6 @@
#include <fc/fwd.hpp> #include <fc/fwd.hpp>
#include <fc/io/raw_fwd.hpp> #include <fc/io/raw_fwd.hpp>
#include <fc/reflect/typename.hpp> #include <fc/reflect/typename.hpp>
<<<<<<< HEAD
#include <fc/io/raw_fwd.hpp>
=======
#include <fc/string.hpp>
>>>>>>> 13430fce127bb3fdba53d218dd840aea8e46408c
namespace fc{ namespace fc{
class sha512; class sha512;