move new comment in changelog

1 files changed, 1 insertions, 7 deletions

diff --git a/ChangeLog b/ChangeLog
index bf8d6e76..bc92243c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -18,6 +18,7 @@ ver. 1.0.3-dev-1 (20??/??/??) - development nightly edition
   (value read from `/proc/sys/net/ipv6/conf/all/disable_ipv6`) if available, otherwise seeks over local IPv6 from network interfaces
   if available for platform and uses DNS to find local IPv6 as a fallback only
 * improve `ignoreself` by considering all local addresses from network interfaces additionally to IPs from hostnames (gh-3132)
+* new action for mikrotik routerOS, adds and removes entries from address lists on the router
 
 
 ver. 1.0.2 (2022/11/09) - finally-war-game-test-tape-not-a-nuclear-alarm
@@ -293,14 +294,7 @@ ver. 0.11.2 (2020/11/23) - heal-the-world-with-security-tools
 * fail2ban-client: extended to unban IP range(s) by subnet (CIDR/mask) or hostname (DNS), gh-2791;
 * extended capturing of alternate tags in filter, allowing combine of multiple groups to single tuple token with new tag
   prefix `<F-TUPLE_`, that would combine value of `<F-V>` with all value of `<F-TUPLE_V?_n?>` tags (gh-2755)
-<<<<<<< HEAD
 
-=======
-* `actioncheck` behavior is changed now (gh-488), so invariant check as well as restore or repair
-   of sane environment (in case of recognized unsane state) would only occur on action errors (e. g.
-   if ban or unban operations are exiting with other code as 0)
-* new action for mikrotik routerOS, adds and removes entries from address lists on the router
->>>>>>> Add action for mikrotik routerOS
 
 ver. 0.11.1 (2020/01/11) - this-is-the-way
 -----------