Skip to content

Commit b753408

Browse files
committed
docs: updated REFERENCE.md
1 parent a307c0c commit b753408

File tree

1 file changed

+2
-4
lines changed

1 file changed

+2
-4
lines changed

REFERENCE.md

+2-4
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88

99
#### Public Classes
1010

11+
* [`zabbix`](#zabbix): This will install and configure the zabbix-server on a single host.
1112
* [`zabbix::agent`](#zabbix--agent): This will install and configure the zabbix-agent deamon
1213
* [`zabbix::database`](#zabbix--database): This will install the correct database and one or more users for correct usage
1314
* [`zabbix::database::sqlite`](#zabbix--database--sqlite): Class to handle sqlite database installations zabbix will automatically create a sqlite schema if one does not already exist.
@@ -55,8 +56,6 @@
5556

5657
## Classes
5758

58-
<<<<<<< HEAD
59-
=======
6059
### <a name="zabbix"></a>`zabbix`
6160

6261
This will install and configure the zabbix-server on a single host.
@@ -834,7 +833,7 @@ Default value: `$zabbix::params::server_javagatewayport`
834833

835834
##### <a name="-zabbix--smsdevices"></a>`smsdevices`
836835

837-
Data type: `Optional[Array[String]]`
836+
Data type: `Optional[Array[String[1]]]`
838837

839838
Which devices to use for sms texting
840839

@@ -1327,7 +1326,6 @@ A hash of additional SAML SSO settings.
13271326

13281327
Default value: `$zabbix::params::saml_settings`
13291328

1330-
>>>>>>> 8dd1863 (feat: added smsdevices param)
13311329
### <a name="zabbix--agent"></a>`zabbix::agent`
13321330

13331331
This will install and configure the zabbix-agent deamon

0 commit comments

Comments
 (0)