fix: Remaining merge conflict trace

roadiz · Oct 20, 2023 · 518f940 · 518f940
1 parent 13ada18
commit 518f940
Showing 1 changed file with 4 additions and 5 deletions.
diff --git a/lib/RoadizCoreBundle/src/Controller/CustomFormController.php b/lib/RoadizCoreBundle/src/Controller/CustomFormController.php
@@ -221,11 +221,10 @@ public function postAction(Request $request, int $id): Response
      * @param Request $request
      * @param int $customFormId
      * @return Response
-<<<<<<< Updated upstream
-     * @throws Exception
-=======
-     * @throws Exception|FilesystemException
->>>>>>> Stashed changes
+     * @throws FilesystemException
+     * @throws LoaderError
+     * @throws RuntimeError
+     * @throws SyntaxError
      */
     public function addAction(Request $request, int $customFormId): Response
     {