fix merge conflicts

This commit is contained in:
Deniod
2024-01-10 16:10:21 +01:00
107 changed files with 144 additions and 115 deletions

View File

@@ -1,4 +1,4 @@
// Copyright 2019-2023 The Hush developers
// Copyright 2019-2024 The Hush developers
// Released under the GPLv3
#include "firsttimewizard.h"
#include "ui_newseed.h"