Remove unneeded Util/Security includings + Resolve including merge conflict with...

diff --git a/mod/admin.php b/mod/admin.php
index 094206eb969fb4e6577cc1d8e398cd1eb43b0b7d..a60af3b1207d367e41ad4dad5122253564210f74 100644 (file)
--- a/mod/admin.php
+++ b/mod/admin.php
@@ -26,7 +26,6 @@ use Friendica\Util\Arrays;
 use Friendica\Util\DateTimeFormat;
 use Friendica\Util\Temporal;
 use Friendica\Util\Network;
-use Friendica\Util\Security;
 
 require_once 'include/enotify.php';
 require_once 'include/text.php';

diff --git a/mod/register.php b/mod/register.php
index 7b53e907ecc359c1ddbe3fbe9d9650cace9d0453..1720e0ff3a385df8a8c1b99bd3013a11be466697 100644 (file)
--- a/mod/register.php
+++ b/mod/register.php
@@ -16,7 +16,6 @@ use Friendica\Database\DBA;
 use Friendica\Model\User;
 use Friendica\Module\Tos;
 use Friendica\Util\DateTimeFormat;
-use Friendica\Util\Security;
 
 require_once 'include/enotify.php';