uPlexa / uplexa

uPlexa: Incentivizing the mass compute power of IoT devices to form a means of anonymous blockchain payments.
https://uplexa.com
Other
48 stars 23 forks source link

missed unresolved conflict #36

Closed bleepster closed 4 years ago

bleepster commented 4 years ago

These were not resolved properly on PR #32.