mirror of
https://github.com/meshtastic/firmware.git
synced 2026-01-21 17:27:30 +00:00
I thought git would be smart enough to understand all the whitespace changes but even with all the flags I know to make it ignore theses it still blows up if there are identical changes on both sides.
I have a solution but it require creating a new commit at the merge base for each conflicting PR and merging it into develop.
I don't think blowing up all PRs is worth for now, maybe if we can coordinate this for V3 let's say.
This reverts commit 0d11331d18.
This commit is contained in:
@@ -4,16 +4,17 @@
|
||||
/**
|
||||
* A simple example module that just replies with "Message received" to any message it receives.
|
||||
*/
|
||||
class ReplyModule : public SinglePortModule {
|
||||
public:
|
||||
/** Constructor
|
||||
* name is for debugging output
|
||||
*/
|
||||
ReplyModule() : SinglePortModule("reply", meshtastic_PortNum_REPLY_APP) {}
|
||||
class ReplyModule : public SinglePortModule
|
||||
{
|
||||
public:
|
||||
/** Constructor
|
||||
* name is for debugging output
|
||||
*/
|
||||
ReplyModule() : SinglePortModule("reply", meshtastic_PortNum_REPLY_APP) {}
|
||||
|
||||
protected:
|
||||
/** For reply module we do all of our processing in the (normally optional)
|
||||
* want_replies handling
|
||||
*/
|
||||
virtual meshtastic_MeshPacket *allocReply() override;
|
||||
protected:
|
||||
/** For reply module we do all of our processing in the (normally optional)
|
||||
* want_replies handling
|
||||
*/
|
||||
virtual meshtastic_MeshPacket *allocReply() override;
|
||||
};
|
||||
|
||||
Reference in New Issue
Block a user