From a93c0688ebf7adc42cc2c9d3e4dff40d186ddfc2 Mon Sep 17 00:00:00 2001 From: Maryam Fareed Date: Sat, 22 Aug 2026 10:48:10 +0500 Subject: [PATCH] fix: resolve unresolved merge conflict markers in chatbot.yml --- .github/workflows/chatbot.yml | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/.github/workflows/chatbot.yml b/.github/workflows/chatbot.yml index b44f96c..5a42251 100644 --- a/.github/workflows/chatbot.yml +++ b/.github/workflows/chatbot.yml @@ -36,15 +36,8 @@ jobs: run: | pip install -r requirements.txt - - name: Run unit and API tests + + - name: Run unit and API tests env: JWT_SECRET_KEY: ${{ secrets.JWT_SECRET_KEY }} -======= - - name: Install dependencies - run: | - pip install -r requirements.txt - - name: Run unit and API tests - env: - JWT_SECRET_KEY: "4d7d6b996c2e65e73b6c03056b45d675ab121910a01e49eb2a39b74aa6f8bae9" - main run: pytest rag-engine/tests -q --tb=short --ignore=rag-engine/tests/test_injection_real_pdf.py \ No newline at end of file