fix quality

src/huggingface_hub/inference/_generated/types/zero_shot_classification.py

@@ -11,13 +11,7 @@
 
 @dataclass
 class ZeroShotClassificationParameters(BaseInferenceType):
-<<<<<<< HEAD
-    """Additional inference parameters
-    Additional inference parameters for Zero Shot Classification
-    """
-=======
     """Additional inference parameters for Zero Shot Classification"""
->>>>>>> 33840bea5991137603af9cfc6e142af5770a2ed7
 
     candidate_labels: List[str]
     """The set of possible class labels to classify the text into."""

src/huggingface_hub/inference/_generated/types/zero_shot_image_classification.py

@@ -28,11 +28,7 @@ class ZeroShotImageClassificationInput(BaseInferenceType):
     inputs: str
     """The input image data to classify as a base64-encoded string."""
     parameters: ZeroShotImageClassificationParameters
-<<<<<<< HEAD
-    """Additional inference parameters"""
-=======
     """Additional inference parameters for Zero Shot Image Classification"""
->>>>>>> 33840bea5991137603af9cfc6e142af5770a2ed7
 
 
 @dataclass

src/huggingface_hub/inference/_generated/types/zero_shot_object_detection.py

@@ -24,11 +24,7 @@ class ZeroShotObjectDetectionInput(BaseInferenceType):
     inputs: str
     """The input image data as a base64-encoded string."""
     parameters: ZeroShotObjectDetectionParameters
-<<<<<<< HEAD
-    """Additional inference parameters"""
-=======
     """Additional inference parameters for Zero Shot Object Detection"""
->>>>>>> 33840bea5991137603af9cfc6e142af5770a2ed7
 
 
 @dataclass