From 49761b94a8ffb2b26ba1a6ed2b3affb05270518e Mon Sep 17 00:00:00 2001
From: uhuruhashimoto <uhuru.g.hashimoto.23@dartmouth.edu>
Date: Mon, 10 Apr 2023 23:00:29 -0400
Subject: [PATCH] merge resolution

---
 meshtastic/mesh.options | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/meshtastic/mesh.options b/meshtastic/mesh.options
index 3a10eff..c28b91c 100644
--- a/meshtastic/mesh.options
+++ b/meshtastic/mesh.options
@@ -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