diff options
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore index 6cd1df2b7a..cd9109b8db 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,21 @@ +<<<<<<< HEAD + + +gogs +*.exe +*.exe~ +.DS_Store +*.db +*.log +custom/ +data/ +.vendor/ +.idea/ +*.iml +public/img/avatar/ + +======= +>>>>>>> b4db9f67548a41922f1b337daf9c9d2b975b55c4 # Compiled Object files, Static and Dynamic libs (Shared Objects) *.o *.a |