From 80e39035f88cabe4320fddd197fb377bb471b313 Mon Sep 17 00:00:00 2001 From: "K. Shankari" Date: Wed, 20 Dec 2023 23:36:18 -0800 Subject: [PATCH] Fix merge conflict the right way We wanted to keep the 3.1.0 not downgrade to 3.0.3 --- .github/workflows/prettier.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/prettier.yml b/.github/workflows/prettier.yml index 576783f04..330a57729 100644 --- a/.github/workflows/prettier.yml +++ b/.github/workflows/prettier.yml @@ -7,6 +7,6 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 - - run: npx prettier@3.0.3 --check www + - run: npx prettier@3.1.0 --check www