diff options
| -rw-r--r-- | .gitignore | 3 | ||||
| -rw-r--r-- | README.md | 5 |
2 files changed, 4 insertions, 4 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 @@ -1,6 +1,3 @@ -Gogs - Go Git Service [](https://app.wercker.com/project/bykey/ad0bdb0bc450ac6f09bc56b9640a50aa) [](https://drone.io/github.com/gogits/gogs/latest) -===================== - Gogs(Go Git Service) is a Self Hosted Git Service in the Go Programming Language.  @@ -57,4 +54,4 @@ There are two ways to install Gogs: ## Contributors -This project was launched by [Unknown](https://github.com/Unknwon) and [lunny](https://github.com/lunny); [fuxiaohei](https://github.com/fuxiaohei) and [slene](https://github.com/slene) joined the team soon after. See [contributors page](https://github.com/gogits/gogs/graphs/contributors) for full list of contributors.
\ No newline at end of file +This project was launched by [Unknown](https://github.com/Unknwon) and [lunny](https://github.com/lunny); [fuxiaohei](https://github.com/fuxiaohei) and [slene](https://github.com/slene) joined the team soon after. See [contributors page](https://github.com/gogits/gogs/graphs/contributors) for full list of contributors. |