mirror of
https://github.com/altlinux/admc.git
synced 2025-02-13 05:57:40 +03:00
Clean CHANGELOG.txt from previous unmerged typos
This commit is contained in:
parent
3526ac6a9c
commit
2b8f69c7af
@ -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
|
||||
|
Loading…
x
Reference in New Issue
Block a user