manual merge fix

2022-05-30 18:40:58 +02:00
parent b924c0a70b 0d6e89332e
commit e846b725f6
1 changed files with 4 additions and 0 deletions
@@ -1,4 +1,8 @@
 #!/bin/sh

 yarn checkIcons
+<<<<<<< HEAD
 exit $?
+=======
+echo $?
+>>>>>>> 0d6e89332e9822b62bcbb8693e203d8691e635cf