merge gitignore

This commit is contained in:
sparkyx 2025-12-27 11:37:38 +01:00
parent f621850e4a
commit 9340c25149

4
.gitignore vendored
View file

@ -47,10 +47,6 @@ local/*
.idea/* .idea/*
include/tfpdf/font/unifont/* include/tfpdf/font/unifont/*
html/ads.html html/ads.html
<<<<<<< HEAD
/nbproject/private/
=======
doc/code/* doc/code/*
nbproject/private/ nbproject/private/
>>>>>>> unstable