Fix wat foutjes in de rebase

Author: NathanHuisman

lib/controller/api/v3/ApiInfoController.php

@@ -7,7 +7,6 @@
 use Symfony\Component\HttpFoundation\JsonResponse;
 use Symfony\Component\HttpKernel\Exception\BadRequestHttpException;
 use Symfony\Component\Routing\Attribute\Route;
-use Symfony\Component\Routing\Annotation\Route;
 use Symfony\Bundle\SecurityBundle\Security;
 use League\Bundle\OAuth2ServerBundle\Security\Authentication\Token\OAuth2Token;
 

lib/entity/groepen/Verticale.php

@@ -23,7 +23,6 @@
 class Verticale extends Groep
 {
 	/**
-<<<<<<< HEAD
 	 * Primary key
 	 * @var string
 	 */
@@ -45,14 +44,6 @@ class Verticale extends Groep
 	#[Serializer\Groups(['datatable', 'log', 'vue'])]
 	#[ORM\Column(type: 'stringkey', unique: true)]
 	public $naam;
-=======
-	* Primary key
-	* @var string
-	*/
-	#[ORM\Column(type: 'string', unique: true, length: 1, options: ['fixed' => true])]
-	#[Serializer\Groups(['datatable', 'log', 'vue'])]
-	public $letter;
->>>>>>> 293c8a774 (Fix meer problemen)
 
 	// Stiekem hebben we helemaal geen leden.
 	public function getLeden()

lib/view/toestemming/ToestemmingModalForm.php

@@ -61,11 +61,7 @@ public function __construct(
 			}
 		}
 
-<<<<<<< HEAD
 		$twig = ContainerFacade::getContainer()->get('csr.hack.twig');
-=======
-		$twig = ContainerFacade::getContainer()->get(Environment::class);
->>>>>>> 293c8a774 (Fix meer problemen)
 
 		$this->addFields([
 			new HtmlComment(