diff options
| author | Lunny Xiao <xiaolunwen@gmail.com> | 2014-03-26 13:56:36 +0800 |
|---|---|---|
| committer | Lunny Xiao <xiaolunwen@gmail.com> | 2014-03-26 13:56:36 +0800 |
| commit | 11b0a97d7a5ba8366fac4cffb3a7b92d94d4aa34 (patch) | |
| tree | 1539d154b8da288c70deffb6cf101d9f3c7692bd /.gitignore | |
| parent | 597f5ede1289ad18974bbe95150f28fa9d8a63e1 (diff) | |
| parent | b4db9f67548a41922f1b337daf9c9d2b975b55c4 (diff) | |
| download | gitea-11b0a97d7a5ba8366fac4cffb3a7b92d94d4aa34.tar.gz gitea-11b0a97d7a5ba8366fac4cffb3a7b92d94d4aa34.zip | |
Merge branch 'master' of localhost:xiaoxiao/gogs3
Conflicts:
.gitignore
README.md
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore index eab518bb53..cd9109b8db 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ +<<<<<<< HEAD gogs @@ -13,6 +14,8 @@ data/ *.iml public/img/avatar/ +======= +>>>>>>> b4db9f67548a41922f1b337daf9c9d2b975b55c4 # Compiled Object files, Static and Dynamic libs (Shared Objects) *.o *.a |