diff options
author | luigi1111 <luigi1111w@gmail.com> | 2019-04-12 18:28:53 -0400 |
---|---|---|
committer | luigi1111 <luigi1111w@gmail.com> | 2019-04-12 18:28:53 -0400 |
commit | 37345921ece7280c2fde031e2a1e32bfbac0479c (patch) | |
tree | dba64d7442b8de96c1a065bed09f6b9a61307687 /.gitattributes | |
parent | Merge pull request #5386 (diff) | |
parent | simplewallet: fix merge error with new welcome command (diff) | |
download | monero-37345921ece7280c2fde031e2a1e32bfbac0479c.tar.xz |
Merge pull request #5423
8f1fe45 simplewallet: fix merge error with new welcome command (moneromooo-monero)
Diffstat (limited to '.gitattributes')
0 files changed, 0 insertions, 0 deletions