fix: remove leftover conflict marker in ApiController

2026-06-09 16:46:03 -04:00
parent 530c394944
commit a424120770
1 changed files with 0 additions and 1 deletions
--- a/src/Controllers/ApiController.php
+++ b/src/Controllers/ApiController.php
@@ -306,7 +306,6 @@ class ApiController
        ]);
    }

-<<<<<<< HEAD
    public function register(): void
    {
        $input = json_decode(file_get_contents('php://input'), true) ?? $_POST;