meshtastic/protobufs
1
0
Fork 0
mirror of https://github.com/meshtastic/protobufs.git synced 2026-04-20 22:13:55 +00:00
Code Issues Projects Releases Packages Wiki Activity

merge resolution

Browse source
This commit is contained in:
uhuruhashimoto 2023-04-10 23:00:29 -04:00
parent e8cfdab886
commit 49761b94a8
1 changed files with 1 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
meshtastic/mesh.options
View file

@ -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