rbxii3/firmware
1
0
Fork 0
mirror of https://github.com/meshtastic/firmware.git synced 2025-12-23 03:00:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

conflict resolution

Browse Source
This commit is contained in:
Thomas Göttgens
2024-10-08 11:41:54 +02:00
parent 37f294d0a6 e6e05dda1e
commit 9d9258a59b
11 changed files with 758 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/serialization/MeshPacketSerializer.cpp
View File

@@ -1,3 +1,4 @@
#ifndef NRF52_USE_JSON
#include "MeshPacketSerializer.h"
#include "JSON.h"
#include "NodeDB.h"
@@ -353,4 +354,5 @@ std::string MeshPacketSerializer::JsonSerializeEncrypted(const meshtastic_MeshPa
delete value;
return jsonStr;
}
}
#endif