jasper 923672a507 update @conflict markers which was forgotten after the switch to ruby 2.2		2015-08-11 20:15:03 +00:00
..
files	prevent errors with ruby 1.9.3 which switched to the psych yaml parser and	2013-06-11 14:51:30 +00:00
patches	switch to use rspec3	2014-10-17 18:00:35 +00:00
pkg	update @conflict markers which was forgotten after the switch to ruby 2.2	2015-08-11 20:15:03 +00:00
distinfo	bump to hiera-1.3.4 which contains a security fix for CVE-2014-3248 which	2014-06-10 19:47:59 +00:00
Makefile	update @conflict markers which was forgotten after the switch to ruby 2.2	2015-08-11 20:15:03 +00:00