Loading app/Models/DivingSession.php +0 −4 Original line number Diff line number Diff line Loading @@ -40,9 +40,5 @@ public function disable() { $this->DS_ACTIVE = 0; $this->save(); ========= public function getDivingGroups(){ return DivingGroup::where('DS_CODE', $this->DS_CODE)->get(); >>>>>>>>> Temporary merge branch 2 } } Loading
app/Models/DivingSession.php +0 −4 Original line number Diff line number Diff line Loading @@ -40,9 +40,5 @@ public function disable() { $this->DS_ACTIVE = 0; $this->save(); ========= public function getDivingGroups(){ return DivingGroup::where('DS_CODE', $this->DS_CODE)->get(); >>>>>>>>> Temporary merge branch 2 } }