From 90f32d38a2931900b268819968913b041f856cad Mon Sep 17 00:00:00 2001 From: Karsa Date: Wed, 16 Nov 2022 18:02:04 +0100 Subject: [PATCH] Fixes merge conflicts --- .githooks/pre-commit | 4 ---- 1 file changed, 4 deletions(-) diff --git a/.githooks/pre-commit b/.githooks/pre-commit index d0ce2cf13..3a113353c 100755 --- a/.githooks/pre-commit +++ b/.githooks/pre-commit @@ -1,8 +1,4 @@ #!/bin/sh pnpm run checkIcons -<<<<<<< HEAD exit $? -======= -echo $? ->>>>>>> 0d6e89332e9822b62bcbb8693e203d8691e635cf