devlab/server-manager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: remove leftover conflict marker in ApiController

Browse Source
This commit is contained in:
Agent
2026-06-09 16:46:03 -04:00
parent 530c394944
commit a424120770
1 changed files with 0 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/Controllers/ApiController.php
View File

@@ -306,7 +306,6 @@ class ApiController
]); ]);
} }
<<<<<<< HEAD
public function register(): void public function register(): void
{ {
$input = json_decode(file_get_contents('php://input'), true) ?? $_POST; $input = json_decode(file_get_contents('php://input'), true) ?? $_POST;