Merge branch 'master' into i18n

hmatuschek · Jul 22, 2024 · 0e8bd03 · 0e8bd03
2 parents b312075 + 49c829f
commit 0e8bd03
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 3 deletions.
diff --git a/lib/dr1801uv_codeplug.cc b/lib/dr1801uv_codeplug.cc
@@ -1675,6 +1675,7 @@ DR1801UVCodeplug::ScanListBankElement::decode(Context &ctx, const ErrorStack &er
     if (! sl.isValid())
       continue;
     j++;
+
     ScanList *obj = sl.toScanListObj(ctx, err);
     if (nullptr == obj) {
       errMsg(err) << "Cannot decode scan list at index " << i << ".";
@@ -1695,6 +1696,7 @@ DR1801UVCodeplug::ScanListBankElement::link(Context &ctx, const ErrorStack &err)
     if (! sl.isValid())
       continue;
     j++;
+
     if (! ctx.has<ScanList>(sl.index())) {
       errMsg(err) << "Cannot link scan list at index " << i
                   << ". Scan list not defined.";

diff --git a/lib/gd73_codeplug.cc b/lib/gd73_codeplug.cc
@@ -751,8 +751,6 @@ GD73Codeplug::DMRSettingsElement::encode(Context &ctx, const ErrorStack &err) {
 
 
 /* ********************************************************************************************* *
-<<<<<<< HEAD
-=======
  * Implementation of GD73Codeplug::EncryptionKeyElement
  * ********************************************************************************************* */
 GD73Codeplug::EncryptionKeyElement::EncryptionKeyElement(uint8_t *ptr, size_t size)

diff --git a/test/dr1801_test.cc b/test/dr1801_test.cc
@@ -73,7 +73,6 @@ DR1801Test::testBasicConfigReencoding() {
   }
 }
 
-
 void
 DR1801Test::testProstProcessingOfEmptyCodeplug() {
   Config config;