From a4241207700bba93aac7b29918fc9c7749b88efc Mon Sep 17 00:00:00 2001
From: Agent <agent@devlab.lat>
Date: Tue, 9 Jun 2026 16:46:03 -0400
Subject: [PATCH] fix: remove leftover conflict marker in ApiController

---
 src/Controllers/ApiController.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/Controllers/ApiController.php b/src/Controllers/ApiController.php
index 3c46cb6..590f3bd 100755
--- 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;