mirror of
https://github.com/go-gitea/gitea.git
synced 2024-12-30 17:35:55 +00:00
11b0a97d7a
Conflicts: .gitignore README.md
40 lines
418 B
Plaintext
40 lines
418 B
Plaintext
<<<<<<< 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
|
|
*.so
|
|
|
|
# Folders
|
|
_obj
|
|
_test
|
|
|
|
# Architecture specific extensions/prefixes
|
|
*.[568vq]
|
|
[568vq].out
|
|
|
|
*.cgo1.go
|
|
*.cgo2.c
|
|
_cgo_defun.c
|
|
_cgo_gotypes.go
|
|
_cgo_export.*
|
|
|
|
_testmain.go
|
|
|
|
*.exe |