aboutsummaryrefslogtreecommitdiff
path: root/src/validation.cpp
diff options
context:
space:
mode:
authorMax K <[email protected]>2020-07-22 20:07:31 +0200
committerGitHub <[email protected]>2020-07-22 20:07:31 +0200
commitf933c83b7502c7fa6552966f170313cfef9b40b2 (patch)
tree50db323a4a163df425f929c2bb20bf25ca350b3d /src/validation.cpp
parentMerge pull request #1548 from preserveddarnell/patch-1 (diff)
parentGet rid of git merge leftover text (diff)
downloaddiscoin-f933c83b7502c7fa6552966f170313cfef9b40b2.tar.xz
discoin-f933c83b7502c7fa6552966f170313cfef9b40b2.zip
Merge pull request #1605 from greenbigfrog/patch-1
Get rid of git merge leftover text
Diffstat (limited to 'src/validation.cpp')
0 files changed, 0 insertions, 0 deletions