--- a/CHANGELOG	Thu Mar 29 13:01:05 2018 -0700
+++ b/CHANGELOG	Fri Apr 06 17:53:41 2018 +0200
@@ -10,6 +10,10 @@
 
   * fixed some memory leak issue
 
+  * templatekw: remove `obsfatedata` templatekw. Individuals fields are
+    available in core as single template functions.
+
+>>>>>>> source: 35349a1debab stable - boris: templatekw: remove obsfatedata t...
 7.3.0 -- 2018-03-21
 ---------------------