From 0c0e17b7a7c8b4e5f827bfa6c583ab424dde8305 Mon Sep 17 00:00:00 2001 From: Jonny Tischbein Date: Wed, 17 Oct 2018 21:52:08 +0200 Subject: [PATCH] Remove unneeded Util/Security includings + Resolve including merge conflict with develop --- mod/admin.php | 1 - mod/register.php | 1 - 2 files changed, 2 deletions(-) diff --git a/mod/admin.php b/mod/admin.php index 094206eb96..a60af3b120 100644 --- 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 7b53e907ec..1720e0ff3a 100644 --- 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';