merge branch add-epp-support into this branch

patemery · patemery · commit 06afcbc5b350 · 2024-04-19T07:17:26.000-04:00
diff --git a/manifests/conf.pp b/manifests/conf.pp
@@ -17,9 +17,12 @@
 #
 # @param template
 #     Path of a erb template file or epp template file without parameters
+<<<<<<< HEAD
 #
 # @param template_epp
 #     Path of an epp template and associated template parameters
+=======
+>>>>>>> add-epp-support
 #
 # @param sudo_config_dir
 #     Where to place configuration snippets.

Original file line number	Diff line number	Diff line change
`@@ -17,9 +17,12 @@`
`17`	`17`	`#`
`18`	`18`	`# @param template`
`19`	`19`	`# Path of a erb template file or epp template file without parameters`
	`20`	`+<<<<<<< HEAD`
`20`	`21`	`#`
`21`	`22`	`# @param template_epp`
`22`	`23`	`# Path of an epp template and associated template parameters`
	`24`	`+=======`
	`25`	`+>>>>>>> add-epp-support`
`23`	`26`	`#`
`24`	`27`	`# @param sudo_config_dir`
`25`	`28`	`# Where to place configuration snippets.`