From 85f4f5296036c1026bd25a0c9af8683c1716b15c Mon Sep 17 00:00:00 2001
From: Parpaillax <parpaillax@orange.fr>
Date: Thu, 25 Apr 2024 15:45:23 +0200
Subject: [PATCH] patch conflict

---
 .../java/fr/eni/enchere/controllers/ArticleController.java   | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/main/java/fr/eni/enchere/controllers/ArticleController.java b/src/main/java/fr/eni/enchere/controllers/ArticleController.java
index b8237f0..08de78a 100644
--- a/src/main/java/fr/eni/enchere/controllers/ArticleController.java
+++ b/src/main/java/fr/eni/enchere/controllers/ArticleController.java
@@ -5,10 +5,7 @@ import fr.eni.enchere.bll.ArticleService;
 import fr.eni.enchere.bll.CategorieService;
 import fr.eni.enchere.bll.RetraitService;
 import fr.eni.enchere.bll.UserService;
-import fr.eni.enchere.bo.Article;
-import fr.eni.enchere.bo.Categorie;
-import fr.eni.enchere.bo.Retrait;
-import fr.eni.enchere.bo.UserProfil;
+import fr.eni.enchere.bo.*;
 import jakarta.servlet.http.HttpServletRequest;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;