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

…matter
AlenVelocity · Jan 2, 2022 · c28dfda · c28dfda
2 parents 44e22e3 + 55ef21b
commit c28dfda
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 9 deletions.
diff --git a/.github/workflows/build-tests.yml b/.github/workflows/build-tests.yml
@@ -23,11 +23,7 @@ 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,11 +27,7 @@ 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

diff --git a/examples/full.mjs b/examples/full.mjs
@@ -17,7 +17,7 @@ import { Sticker } from '../dist/index.js'
     const getOptions = (pack = '', author = '') => ({
         pack,
         type,
-        author: `${author}-${type}`,
+        author: `${author}-${type}`
     })
     await (async () => {
         console.log('Static Potrait')