search

OnionIoT / Onion-Docs

Documentation for all things Onion
https://docs.onion.io
GNU General Public License v3.0
112 stars 65 forks source link

Fix merge error #63

Closed jjok closed 6 years ago

jjok commented 6 years ago

I assume <<<<<<< HEAD isn't actually meant to be there.

greenbreakfast commented 6 years ago

absolutely correct, good catch!