merge resolution

pull/341/head
uhuruhashimoto 2023-04-10 23:00:29 -04:00
rodzic e8cfdab886
commit 49761b94a8
1 zmienionych plików z 1 dodań i 3 usunięć

Wyświetl plik

@ -51,8 +51,6 @@
*Waypoint.name max_size:30
*Waypoint.description max_size:100
<<<<<<< HEAD
*NeighborInfo.neighbors max_count:10
=======
*DeviceMetadata.firmware_version max_size:18
>>>>>>> 3e5ab67ff6659476df66bde6bbbae3c520460db9