search

automote / ESP-CoAP

This repo contains CoAP protocol for ESP-12E
http://thingtronics.com
GNU General Public License v3.0
71 stars 28 forks source link

Remove git merge conflicts #8

Closed Ka0o0 closed 6 years ago

kke commented 6 years ago

Going to merge?

lovelesh commented 6 years ago

@kke @Ka0o0 commit merged