Browse Source

merge conflict resolve

remotes/origin/mohammad
mahdihty 4 years ago
parent
commit
58cd8afb36
  1. 15
      app/Models/User.php

15
app/Models/User.php

@ -5,14 +5,13 @@ namespace App\Models;
use App\Models\File;
use App\Models\Model;
use App\Models\SoftDeletes;
use App\Models\ReportableRelation;
use Illuminate\Notifications\Notifiable;
use Illuminate\Validation\Rule;
use Illuminate\Http\UploadedFile;
use Spatie\MediaLibrary\HasMedia;
use Illuminate\Auth\Authenticatable;
use Laravel\Lumen\Auth\Authorizable;
use Illuminate\Notifications\Notifiable;
use Spatie\MediaLibrary\InteractsWithMedia;
use Illuminate\Foundation\Auth\Access\Authorizable;
use Spatie\MediaLibrary\MediaCollections\Models\Media;
use Illuminate\Contracts\Auth\Authenticatable as AuthenticatableContract;
use Illuminate\Contracts\Auth\Access\Authorizable as AuthorizableContract;
@ -44,16 +43,6 @@ class User extends Model implements AuthenticatableContract, AuthorizableContrac
public $detach_relation = false;
/**
* Specifies the user's FCM token
*
* @return string
*/
public function routeNotificationForFcm()
{
return $this->fingerprints()->fcm_token;
}
public function updateRelations()
{
// projects relations

Loading…
Cancel
Save