resolve merge conflict

src/keria/app/aiding.py

@@ -747,42 +747,6 @@ def on_put(self, req, rep, name):
         rep.content_type = "application/json"
         rep.data = json.dumps(data).encode("utf-8")
 
-    def on_delete(self, req, rep, name):
-        """Identifier delete endpoint
-
-        Parameters:
-            req (Request): falcon.Request HTTP request object
-            rep (Response): falcon.Response HTTP response object
-            name (str): human-readable name or prefix for Hab to delete
-        ---
-        summary: Delete an identifier.
-        description: This endpoint deletes an identifier by its name or prefix.
-        tags:
-        - Identifier
-        parameters:
-        - in: path
-          name: name or prefix
-          schema:
-            type: string
-          required: true
-          description: The human-readable name of the identifier or its prefix.
-        responses:
-            200:
-                description: Successfully deleted the identifier.
-            400:
-                description: Bad request. This could be due to a missing or invalid name parameter.
-            404:
-                description: The requested identifier was not found.
-        """
-        if not name:
-            raise falcon.HTTPBadRequest(description="name is required")
-        agent = req.context.agent
-        hab = agent.hby.habs[name] if name in agent.hby.habs else agent.hby.habByName(name)
-        if hab is None:
-            raise falcon.HTTPNotFound(title=f"No AID with name or prefix {name} found")
-        agent.hby.deleteHab(name)
-        rep.status = falcon.HTTP_200
-
     def on_post(self, req, rep, name):
         """Identifier events endpoint