fix(actions): docker agents

Author: dineshpinto

.github/workflows/docker-agents.yml

@@ -24,18 +24,7 @@ jobs:
           - name: "PDF Ingestion"
             extras: "pdf"
             filename: "ingest_pdf.py"
-<<<<<<< HEAD
-<<<<<<< HEAD
-            test_timeout: "300" # 5 minutes
-
-=======
             test_timeout: "300"  # 5 minutes
-    
->>>>>>> d596503 (fix(actions): workflows and docs)
-=======
-            test_timeout: "300" # 5 minutes
-
->>>>>>> 36471ad (fix(actions): update actions yaml)
     env:
       LOG_LEVEL: INFO
       AGENT__GEMINI_MODEL: "gemini-2.0-flash"
@@ -136,15 +125,6 @@ jobs:
           docker run --rm fai-agent-${{ matrix.agent.extras }} \
             python -c "
           import sys
-<<<<<<< HEAD
-<<<<<<< HEAD
-
-=======
-          
->>>>>>> d596503 (fix(actions): workflows and docs)
-=======
-
->>>>>>> 36471ad (fix(actions): update actions yaml)
           extras = '${{ matrix.agent.extras }}'
           print(f'Testing dependencies for extras: {extras}')
 
@@ -236,12 +216,5 @@ jobs:
           test -f agents/ingest_pdf.py
           test -d agents/data
           test -f agents/data/create_sample_invoice.py
-<<<<<<< HEAD
-<<<<<<< HEAD
-          echo "✅ Agents directory structure is correct"
-=======
-          echo "✅ Agents directory structure is correct"
->>>>>>> d596503 (fix(actions): workflows and docs)
-=======
+
           echo "✅ Agents directory structure is correct"
->>>>>>> 36471ad (fix(actions): update actions yaml)