fisharebest / webtrees

app/SessionDatabaseHandler.php

Spacing +1 added lines, -1 removed lines

@@ -114,7 +114,7 @@
 
             // Only update session once a minute to reduce contention on the session table.
             if ($now->subtractMinutes(1)->timestamp() > Registry::timestampFactory()->fromString($this->row->session_time)->timestamp()) {
-                $updates['session_time'] =  $now->toDateTimeString();
+                $updates['session_time'] = $now->toDateTimeString();
             }
 
             if ($updates !== []) {

app/Http/Middleware/UpdateDatabaseSchema.php

Spacing +1 added lines, -1 removed lines

@@ -33,7 +33,7 @@
 
 use function array_map;
 use function implode;
-<<<<<<< HEAD
+<< << <<< HEAD
 =======
 use function microtime;
 >>>>>>> cbed0ac0da (Create a new database abstraction layer)