mirror_php/humhub
1
0
Fork 0
mirror of https://github.com/humhub/humhub.git synced 2025-01-29 20:38:26 +01:00
Code Issues Projects Releases Wiki Activity

🐛 Fix merge conflict (#3167)

Browse Source
This commit is contained in:
Daniel Kesselberg 2018-06-07 17:48:08 +02:00 committed by GitHub
parent 7dc71f8bbe
commit e4bf634b71
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 0 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
protected/humhub/modules/space/models/Space.php
View File

@ -12,7 +12,6 @@ use humhub\modules\search\interfaces\Searchable;
use humhub\modules\search\events\SearchAddEvent;
use humhub\modules\space\behaviors\SpaceModelMembership;
use humhub\modules\space\behaviors\SpaceController;
use humhub\modules\space\behaviors\SpaceModelMembership;
use humhub\modules\user\behaviors\Followable;
use humhub\components\behaviors\GUID;
use humhub\modules\content\components\behaviors\SettingsBehavior;