matplotlib
diff --git a/‎.github/workflows/conflictcheck.yml
Lines changed: 4 additions & 0 deletions b/‎.github/workflows/conflictcheck.yml
Lines changed: 4 additions & 0 deletions
diff --git a/‎lib/matplotlib/mpl-data/fonts/ttf/wqy-zenhei.ttc
16 MB b/‎lib/matplotlib/mpl-data/fonts/ttf/wqy-zenhei.ttc
16 MB
diff --git a/‎lib/matplotlib/mpl-data/fonts/ttf/wqy-zenhei.ttf
12.3 MB b/‎lib/matplotlib/mpl-data/fonts/ttf/wqy-zenhei.ttf
12.3 MB
@@ -17,7 +17,11 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Check if PRs have merge conflicts
+<<<<<<< HEAD
         uses: eps1lon/actions-label-merge-conflict@1b1b1fcde06a9b3d089f3464c96417961dde1168  # v3.0.2
+=======
+        uses: eps1lon/actions-label-merge-conflict@6d74047dcef155976a15e4a124dde2c7fe0c5522  # v3.0.1
+>>>>>>> c35a0e576c (Backport PR #28219: Bump the actions group with 2 updates)
         with:
           dirtyLabel: "status: needs rebase"
           repoToken: "${{ secrets.GITHUB_TOKEN }}"