aboutsummaryrefslogtreecommitdiff
path: root/src/validation.cpp
diff options
context:
space:
mode:
authorJonathan <[email protected]>2019-08-05 21:51:05 +0200
committerGitHub <[email protected]>2019-08-05 21:51:05 +0200
commit8877f8ed912b43fce29b48d5b7df3c099f52500a (patch)
tree6142bcc236fcf8052085ca99c0b32562b3442dee /src/validation.cpp
parentMerge pull request #1587 from langerhans/master (diff)
downloaddiscoin-8877f8ed912b43fce29b48d5b7df3c099f52500a.tar.xz
discoin-8877f8ed912b43fce29b48d5b7df3c099f52500a.zip
Get rid of git merge leftover text
Diffstat (limited to 'src/validation.cpp')
0 files changed, 0 insertions, 0 deletions