Jared Quick 12890408bb Fix control merging when overriding child controls (#3155) ... * Fix the control merging issues when overriding child controls. * Fix rubocop issue and vendor compression. * Add in lock file for vendor profile Signed-off-by: Jared Quick <jquick@chef.io>		2018-06-21 13:37:47 -04:00
..
e39eb85366b272bae98e5eecdfac9f84c50a9ae9dd625fba2ce847268a6c3477	Fix control merging when overriding child controls (#3155)	2018-06-21 13:37:47 -04:00