diff --git a/adm/config_form.php b/adm/config_form.php index 317f93125..da6e618ba 100644 --- a/adm/config_form.php +++ b/adm/config_form.php @@ -885,20 +885,12 @@ if ($config['cf_sms_use'] && $config['cf_icode_id'] && $config['cf_icode_pw']) { -<<<<<<< HEAD - MID -
-
- API Key - -======= MID SRA -
+

API Key - ->>>>>>> origin/inicis-cert-sa +