diff options
| author | Riccardo Spagni <ric@spagni.net> | 2018-09-22 21:09:29 +0200 |
|---|---|---|
| committer | Riccardo Spagni <ric@spagni.net> | 2018-09-22 21:09:29 +0200 |
| commit | 8a61f669a9e8afcb7774face63d492d3833478a1 (patch) | |
| tree | b3ff06839520fbbf6577da3cab9c9783e92e4b35 /src/device/device.cpp | |
| parent | fb47963e0976457fd9ddef8052054fa281974231 (diff) | |
| parent | c05f98d4c369ccf00c848a7d517f3289c602e8d3 (diff) | |
| download | monzero-core-8a61f669a9e8afcb7774face63d492d3833478a1.tar.gz monzero-core-8a61f669a9e8afcb7774face63d492d3833478a1.tar.xz monzero-core-8a61f669a9e8afcb7774face63d492d3833478a1.zip | |
Merge pull request #4416
c05f98d4 README: remove overlooked conflict (moneromooo-monero)
Diffstat (limited to 'src/device/device.cpp')
0 files changed, 0 insertions, 0 deletions