fisharebest / webtrees

resources/lang/en-US/messages.php

Indentation +2 added lines, -2 removed lines

@@ -1,6 +1,6 @@
 <?php
 
 return array (
-  '%H:%i:%s' => '%g:%i:%s %a',
-  '%j %F %Y' => '%F %j, %Y',
+    '%H:%i:%s' => '%g:%i:%s %a',
+    '%j %F %Y' => '%F %j, %Y',
 );

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)
-    }
-}