resolve merge conflicts

rejth · Jun 2, 2024 · 430ad25 · 430ad25
1 parent fc37501
commit 430ad25
Show file tree

Hide file tree

Showing 10 changed files with 132 additions and 63 deletions.
diff --git a/.eslintignore b/.eslintignore
@@ -1 +1,2 @@
 node_modules
+dist
diff --git a/.husky/pre-commit b/.husky/pre-commit
@@ -0,0 +1 @@
+npx lint-staged
diff --git a/README.md b/README.md
@@ -9,8 +9,8 @@
 
 ## Possible improvements
 
-1. Don't scale images in `drawImage()`. Cache various image sizes on an offscreen canvas when loading instead of constantly scaling them in `drawImage()`.
-2. Mobile friendliness.
+1. Don't scale images in `drawImage()`. \
+   Cache various image sizes on an offscreen canvas when loading instead of constantly scaling them in `drawImage()`.
 
 ## Current technical issues
 
@@ -42,7 +42,7 @@ But this does not work, because the `render` function has a `doSomething` functi
 <ColorDropper useWorker>
   <Layer
     render={({ context }) => {
-      doSomething(variable)
+      doSomething(variable);
     }}
   />
 </ColorDropper>