idevelopment / timecontrol

app/Http/Controllers/StaffController.php

Indentation +4 added lines, -4 removed lines

@@ -261,10 +261,10 @@
     public function update(Request $request)
     {
         /** TODO: Add validation - Tjoosten
-        *  <<<<<<< Updated upstream
-        *  =======
-        *  >>>>>>> Stashed changes 
-        */
+         *  <<<<<<< Updated upstream
+         *  =======
+         *  >>>>>>> Stashed changes 
+         */
         $user = User::findOrFail(auth()->user()->id);
         $user->fname = $request->get('email');
         $user->name = $request->get('name');