JorropoandGitHub
beb268ff25
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.
20 lines
354 B
C++
20 lines
354 B
C++
#include "kbMatrixImpl.h"
|
|
#include "InputBroker.h"
|
|
|
|
#ifdef INPUTBROKER_MATRIX_TYPE
|
|
|
|
KbMatrixImpl *kbMatrixImpl;
|
|
|
|
KbMatrixImpl::KbMatrixImpl() : KbMatrixBase("matrixKB") {}
|
|
|
|
void KbMatrixImpl::init()
|
|
{
|
|
if (!INPUTBROKER_MATRIX_TYPE) {
|
|
disable();
|
|
return;
|
|
}
|
|
|
|
inputBroker->registerSource(this);
|
|
}
|
|
|
|
#endif // INPUTBROKER_MATRIX_TYPE
|