Fixes merge conflicts

2022-11-16 18:02:04 +01:00
parent 04ada85c0f
commit 90f32d38a2
1 changed files with 0 additions and 4 deletions
@@ -1,8 +1,4 @@
 #!/bin/sh

 pnpm run checkIcons
-<<<<<<< HEAD
 exit $?
-=======
-echo $?
->>>>>>> 0d6e89332e9822b62bcbb8693e203d8691e635cf