Archives/lokinet
2
0
Fork 0
mirror of https://github.com/oxen-io/lokinet.git synced 2024-11-15 12:13:24 +00:00
Code Issues Projects Releases Wiki Activity

make it compile

Browse Source
This commit is contained in:
Jeff Becker 2020-01-27 11:56:07 -05:00
parent 4f81b913ef
commit 1543284f6b
No known key found for this signature in database
GPG Key ID: F357B3B42F6F9B05
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
llarp/router_version.hpp
View File

@ -3,7 +3,6 @@
#include <array>
#include <util/bencode.hpp>
<<<<<<< HEAD
#include <constants/version.hpp>
#include <constants/proto.hpp>
@ -65,7 +64,8 @@ namespace llarp
uint64_t m_ProtoVersion = LLARP_PROTO_VERSION;
};
inline std::ostream& operator<<(std::ostream& out, const RouterVersion& rv)
inline std::ostream&
operator<<(std::ostream& out, const RouterVersion& rv)
{
return out << rv.ToString();
}