merge gitignore
This commit is contained in:
parent
f621850e4a
commit
9340c25149
1 changed files with 0 additions and 4 deletions
4
.gitignore
vendored
4
.gitignore
vendored
|
|
@ -47,10 +47,6 @@ local/*
|
|||
.idea/*
|
||||
include/tfpdf/font/unifont/*
|
||||
html/ads.html
|
||||
<<<<<<< HEAD
|
||||
/nbproject/private/
|
||||
=======
|
||||
doc/code/*
|
||||
nbproject/private/
|
||||
|
||||
>>>>>>> unstable
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue