Fixes #325 - Update to latest Azure SDK BOM

manorrock · Jan 15, 2024 · 20843ec · 20843ec
1 parent 78ce589
commit 20843ec
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/azure-keyvault/src/main/java/keyvault/KeyVaultResource.java b/azure-keyvault/src/main/java/keyvault/KeyVaultResource.java
@@ -3,11 +3,7 @@
 import jakarta.inject.Singleton;
 import jakarta.json.bind.Jsonb;
 import jakarta.json.bind.JsonbBuilder;
-<<<<<<< Updated upstream
-import jakarta.servlet.http.HttpServletResponse;
-=======
 import jakarta.json.bind.JsonbException;
->>>>>>> Stashed changes
 import jakarta.ws.rs.GET;
 import jakarta.ws.rs.PUT;
 import jakarta.ws.rs.Path;