fisharebest / webtrees

app/Http/RequestHandlers/ModulesCustomTagsAction.php

Indentation -6 removed lines

@@ -46,9 +46,3 @@
         FlashMessages::addMessage(I18N::translate('The website preferences have been updated.'), 'success');
 
 <<<<<<< HEAD
-        return redirect(route(ModulesCustomTagsPage::class));
-=======
-        return redirect(route(ControlPanel::class));
->>>>>>> 940a0197f (Merge changes from develop)
-    }
-}

Switch Indentation -6 removed lines

@@ -46,9 +46,3 @@
         FlashMessages::addMessage(I18N::translate('The website preferences have been updated.'), 'success');
 
 <<<<<<< HEAD
-        return redirect(route(ModulesCustomTagsPage::class));
-=======
-        return redirect(route(ControlPanel::class));
->>>>>>> 940a0197f (Merge changes from develop)
-    }
-}

Spacing +1 added lines, -7 removed lines

@@ -45,10 +45,4 @@
 
         FlashMessages::addMessage(I18N::translate('The website preferences have been updated.'), 'success');
 
-<<<<<<< HEAD
-        return redirect(route(ModulesCustomTagsPage::class));
-=======
-        return redirect(route(ControlPanel::class));
->>>>>>> 940a0197f (Merge changes from develop)
-    }
-}
+<< << <<< HEAD

Braces -6 removed lines

@@ -46,9 +46,3 @@
         FlashMessages::addMessage(I18N::translate('The website preferences have been updated.'), 'success');
 
 <<<<<<< HEAD
-        return redirect(route(ModulesCustomTagsPage::class));
-=======
-        return redirect(route(ControlPanel::class));
->>>>>>> 940a0197f (Merge changes from develop)
-    }
-}

Upper-Lower-Casing -6 removed lines

@@ -46,9 +46,3 @@
         FlashMessages::addMessage(I18N::translate('The website preferences have been updated.'), 'success');
 
 <<<<<<< HEAD
-        return redirect(route(ModulesCustomTagsPage::class));
-=======
-        return redirect(route(ControlPanel::class));
->>>>>>> 940a0197f (Merge changes from develop)
-    }
-}