From 9b6a86efbead4ee365aea5a669b446e0d8bc34c9 Mon Sep 17 00:00:00 2001
From: Jm Casler <jm@casler.org>
Date: Thu, 2 Dec 2021 16:41:59 -0800
Subject: [PATCH] Fixing conflict.

---
 storeforward.proto | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/storeforward.proto b/storeforward.proto
index a148175..662aa7d 100644
--- a/storeforward.proto
+++ b/storeforward.proto
@@ -9,7 +9,7 @@ option go_package = "github.com/meshtastic/gomeshproto";
 
     
 
-message StoreAndForward {
+message StoreAndForwardMessage {
 
     /*
      * 1   - 99  = From Router