From 2b8f69c7af72b3457ae0c1b380a1639dee05b0fb Mon Sep 17 00:00:00 2001 From: Evgeny Sinelnikov Date: Wed, 7 Sep 2022 01:25:01 +0400 Subject: [PATCH] Clean CHANGELOG.txt from previous unmerged typos --- CHANGELOG.txt | 3 --- 1 file changed, 3 deletions(-) diff --git a/CHANGELOG.txt b/CHANGELOG.txt index a7ef9bb0..68b3483a 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -261,14 +261,11 @@ CHANGELOG connection options. ----------------------------------------------------------------------- -<<<<<<< HEAD VERSION 0.7.1 ----------------------------------------------------------------------- - Misc: Fix stack smashing on 32 bit systems. (#294) ----------------------------------------------------------------------- -======= ->>>>>>> release/0-9-0-test VERSION 0.7.0 ----------------------------------------------------------------------- - Manual: Fixed manual not opening when app is installed