Resolved merge conflict in CHANGELOG

This commit is contained in:
B. Petersen
2023-04-04 17:09:53 +02:00
12 changed files with 49 additions and 16 deletions

View File

@@ -1,6 +1,6 @@
[package]
name = "deltachat_ffi"
version = "1.112.5"
version = "1.112.6"
description = "Deltachat FFI"
edition = "2018"
readme = "README.md"

View File

@@ -7069,6 +7069,11 @@ void dc_event_unref(dc_event_t* event);
/// `%1$s` will be replaced by name and address of the account.
#define DC_STR_BACKUP_TRANSFER_QR 162
/// "Account transferred to your second device."
///
/// Used as a device message after a successful backup transfer.
#define DC_STR_BACKUP_TRANSFER_MSG_BODY 163
/**
* @}
*/