+<<<<<<< ours
Generated 2020-09-28T13:50:10.100+02:00
+=======
+ Generated 2020-09-23T23:57:22.462+02:00
+>>>>>>> theirs
diff --git a/sdrbase/settings/featuresetpreset.cpp b/sdrbase/settings/featuresetpreset.cpp
new file mode 100644
index 000000000..494824a05
--- /dev/null
+++ b/sdrbase/settings/featuresetpreset.cpp
@@ -0,0 +1,97 @@
+///////////////////////////////////////////////////////////////////////////////////
+// Copyright (C) 2020 Edouard Griffiths, F4EXB //
+// //
+// This program is free software; you can redistribute it and/or modify //
+// it under the terms of the GNU General Public License as published by //
+// the Free Software Foundation as version 3 of the License, or //
+// (at your option) any later version. //
+// //
+// This program is distributed in the hope that it will be useful, //
+// but WITHOUT ANY WARRANTY; without even the implied warranty of //
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the //
+// GNU General Public License V3 for more details. //
+// //
+// You should have received a copy of the GNU General Public License //
+// along with this program. If not, see