mirror of
https://github.com/appwrite/appwrite
synced 2026-05-24 09:28:40 +00:00
fix: gitignore merge conflict leftover
This commit is contained in:
parent
a5d43ddf71
commit
0b11e0cc92
1 changed files with 0 additions and 1 deletions
1
.gitignore
vendored
1
.gitignore
vendored
|
|
@ -16,5 +16,4 @@ dev/yasd_init.php
|
||||||
.phpunit.result.cache
|
.phpunit.result.cache
|
||||||
Makefile
|
Makefile
|
||||||
appwrite.json
|
appwrite.json
|
||||||
<<<<<<< HEAD
|
|
||||||
/.zed/
|
/.zed/
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue