From ba4273b8eca897c462658eb89bfab98f21587634 Mon Sep 17 00:00:00 2001
From: Felipe Zimmerle <fcosta@trustwave.com>
Date: Mon, 24 Dec 2018 13:59:21 -0300
Subject: [PATCH] CHANGES: Adds info on #1978

---
 CHANGES | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGES b/CHANGES
index aaf652d9..3732af75 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,8 @@
 v3.0.4 - YYYY-MMM-DD (to be released)
 -------------------------------------
 
+ - Complete merging of particular rule properties
+   [Issue #1978 - @defanator]
  - Replaces AC_CHECK_FILE with 'test -f'
    [Issue #1984 - @chuckwolber]
  - Fix inet addr handling on 64 bit big endian systems