Developing lightweight computation at the DSG edge

Commit 70c51ff7 authored by Roger Pueyo Centelles's avatar Roger Pueyo Centelles
Browse files

Fix merge debris from testing


Signed-off-by: default avatarRoger Pueyo Centelles <roger.pueyo@guifi.net>
parent 056b77be
......@@ -12,11 +12,8 @@ ece4fd4ac931b834b040d2f51fe39be1 MikroTik_RBSXT5nDr2
14ceaea73ef6bda4e9598787528dd285 Nexx_WT1520-4M
ba9067da71a545413e7c8a5cbbd0a82d Nexx_WT3020-4M
d11c4c408a408f6a14c80b92d24af992 PC-Engines_Alix
<<<<<<< HEAD
=======
24774324dda952994b0d7a6505ea621a Phicomm_K2P
6fd7059da6beaf056b21bd51c27cd7e1 TP-Link_CPE-510
>>>>>>> master
40ab996cfac0fcaa4d9b36a7bdfe3312 TP-Link_TL-WA7510N
ffca315e803385c839a7988d6e97c237 TP-Link_TL-WDR3500-v1
2e7a5c89b8b1f96bb35dc2ce8202d708 TP-Link_TL-WDR4300-v1
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment