fix: gitignore merge conflict leftover

This commit is contained in:
Torsten Dittmann 2024-11-20 11:52:27 +01:00
parent a5d43ddf71
commit 0b11e0cc92

1
.gitignore vendored
View file

@ -16,5 +16,4 @@ dev/yasd_init.php
.phpunit.result.cache
Makefile
appwrite.json
<<<<<<< HEAD
/.zed/