Resolve merge conflict in README.md

Dockerfile

@@ -1,23 +0,0 @@
-FROM python:3.9-slim
-
-WORKDIR /app
-
-# Install system dependencies including libGL
-RUN apt-get update && apt-get install -y \
-    libgl1 \
-    libglib2.0-0 \
-    libsm6 \
-    libxext6 \
-    libxrender-dev \
-    libgomp1 \
-    && rm -rf /var/lib/apt/lists/*
-
-
-COPY requirements.txt .
-RUN pip install --no-cache-dir -r requirements.txt
-
-COPY . .
-
-EXPOSE 7860
-
-CMD ["uvicorn", "app.main:app", "--host", "0.0.0.0", "--port", "7860"]

README.md

@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 ---
 title: Clothing Attribute Detection
 emoji: "👕"
@@ -8,16 +7,4 @@ sdk: "docker"
 sdk_version: "latest"
 app_file: "Dockerfile"
 pinned: false
----
-=======
----
-title: Clothing Attribute Detection
-emoji: "👕"
-colorFrom: "blue"
-colorTo: "green"
-sdk: "docker"
-sdk_version: "latest"
-app_file: "Dockerfile"
-pinned: false
----
->>>>>>> cb600bb7c71123c0b5b011b69e8b5345b1468115
+---