Merge branch 'master' of https://github.com/AlenSaito1/wa-sticker-for…

…matter
AlenVelocity · Jan 2, 2022 · 44e22e3 · 44e22e3
1 parent b516d89
commit 44e22e3
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 0 deletions.
diff --git a/.github/workflows/build-tests.yml b/.github/workflows/build-tests.yml
@@ -23,7 +23,11 @@ jobs:
         node-version: ${{ matrix.node-version }}
         cache: 'npm'
     - run: sudo apt-get update
+<<<<<<< HEAD
     - run: sudo apt-get install ffmpeg libvips-dev linuxmusl-arm64v8
+=======
+    - run: sudo apt-get install ffmpeg libvips-dev
+>>>>>>> 55ef21be4fa9f0ab5827a4e7a1e9f2ff1a994ca5
     - run: npm i -g npm@latest
     - run: npm ci
     - run: npm run build

diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml
@@ -27,7 +27,11 @@ jobs:
 
             - name: Install Libvips
               run: sudo apt-get update
+<<<<<<< HEAD
               run: sudo apt-get install libvips-dev linuxmusl-arm64v8
+=======
+              run: sudo apt-get install libvips-dev
+>>>>>>> 55ef21be4fa9f0ab5827a4e7a1e9f2ff1a994ca5
 
             - name: Install Dependencies
               run: npm i