updated CHANGELOG

diff --git a/CHANGELOG b/CHANGELOG
index cdf0530..1c1dc20 100644 (file)
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,5 +1,6 @@
 * 1.1.2
 
+ * fixed inheritance when using conditional parents
  * fixed compilation of templates when the body of a child template is not empty
  * fixed output when a macro throws an exception
  * fixed a parsing problem when a large chunk of text is enclosed in a comment tag