fix merge conflict in changelog

Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
This commit is contained in:
Steven Armstrong 2011-03-16 14:41:43 +01:00
commit 59e774b08d
43 changed files with 916 additions and 480 deletions

View file

@ -1,10 +1,19 @@
1.0.4:
1.1.0: 2011-03-16
* Replace type __file with __file, __directory, __link
* Document cdist-env
* Document cdist-config
* Document cdist-dir
* Document cdist-quickstart
1.0.4: 2011-03-15
* New type __motd
* New type __addifnosuchline
* New type __addifnosuchline (Daniel Roth)
* Document type __issue
* New type __user
* Document type __package
* Document type __package_emerge
* Document type __package_pacman
* Document type __package_apt
* New parameter for __file: --owner and --group
1.0.3: 2011-03-11
* Update regexp used for sane characters