Fixing merge issue

redstonemercury · redstonemercury · commit 2d22f05fcc00 · 2014-10-20T16:29:31.000-04:00
diff --git a/manifests/agent.pp b/manifests/agent.pp
@@ -303,6 +303,7 @@
       setting => 'templatedir',
       section => 'main',
     }
+  }
   ini_setting {'puppetagentconfigtimeout':
     ensure  => present,
     setting => 'configtimeout',

Original file line number	Diff line number	Diff line change
`@@ -303,6 +303,7 @@`
`303`	`303`	`setting => 'templatedir',`
`304`	`304`	`section => 'main',`
`305`	`305`	`}`
	`306`	`+ }`
`306`	`307`	`ini_setting {'puppetagentconfigtimeout':`
`307`	`308`	`ensure => present,`
`308`	`309`	`setting => 'configtimeout',`