$ git merge upstream/master
Removing templates/user/settings/social.tmpl
Auto-merging templates/user/settings/profile.tmpl
CONFLICT (content): Merge conflict in templates/user/settings/profile.tmpl
Removing templates/user/settings/nav.tmpl
Auto-merging templates/user/profile.tmpl
CONFLICT (content): Merge conflict in templates/user/profile.tmpl
Removing templates/user/issues.tmpl
Removing templates/user/dashboard/pulls.tmpl
Removing templates/user/dashboard/nav.tmpl
Auto-merging templates/user/dashboard/feeds.tmpl
CONFLICT (content): Merge conflict in templates/user/dashboard/feeds.tmpl
Auto-merging templates/user/auth/signup.tmpl
CONFLICT (content): Merge conflict in templates/user/auth/signup.tmpl
Auto-merging templates/status/404.tmpl
CONFLICT (content): Merge conflict in templates/status/404.tmpl
Removing templates/status/403.tmpl
Removing templates/status/401.tmpl
Removing templates/repo/toolbar.tmpl
Removing templates/repo/sidebar_mini.tmpl
Removing templates/repo/sidebar.tmpl
Removing templates/repo/settings/hook_types.tmpl
Auto-merging templates/repo/settings/hook_new.tmpl
CONFLICT (content): Merge conflict in templates/repo/settings/hook_new.tmpl
Removing templates/repo/setting_nav.tmpl
Removing templates/repo/release/edit.tmpl
Removing templates/repo/pulls.tmpl
Removing templates/repo/pr2/list.tmpl
Removing templates/repo/nav.tmpl
Removing templates/repo/milestone2/list.tmpl
Removing templates/repo/list.tmpl
Removing templates/repo/issue2/list.tmpl
Removing templates/repo/issue2/labels.tmpl
Auto-merging templates/repo/issue/view.tmpl
CONFLICT (content): Merge conflict in templates/repo/issue/view.tmpl
Removing templates/repo/issue/milestone_edit.tmpl
Removing templates/repo/issue/milestone.tmpl
Auto-merging templates/repo/issue/list.tmpl
CONFLICT (content): Merge conflict in templates/repo/issue/list.tmpl
Removing templates/repo/issue/create.tmpl
Removing templates/repo/fork.tmpl
Removing templates/repo/branch.tmpl
Removing templates/org/settings/nav.tmpl
Removing templates/org/new.tmpl
Removing templates/org/base/header.tmpl
Removing templates/ng/base/social.tmpl
CONFLICT (modify/delete): templates/ng/base/header.tmpl deleted in upstream/master and modified in HEAD. Version HEAD of templates/ng/base/header.tmpl left in tree.
CONFLICT (modify/delete): templates/ng/base/head.tmpl deleted in upstream/master and modified in HEAD. Version HEAD of templates/ng/base/head.tmpl left in tree.
CONFLICT (modify/delete): templates/ng/base/footer.tmpl deleted in upstream/master and modified in HEAD. Version HEAD of templates/ng/base/footer.tmpl left in tree.
Removing templates/ng/base/alert.tmpl
Removing templates/mail/notify/mention.tmpl
Removing templates/mail/auth/register_success.tmpl
Removing templates/mail/auth/active.tmpl
Auto-merging templates/home.tmpl
CONFLICT (content): Merge conflict in templates/home.tmpl
Removing templates/explore/nav.tmpl
Removing templates/base/navbar.tmpl
Removing templates/base/head_old.tmpl
Auto-merging templates/base/head.tmpl
CONFLICT (content): Merge conflict in templates/base/head.tmpl
Removing templates/base/footer_old.tmpl
Auto-merging templates/base/footer.tmpl
CONFLICT (content): Merge conflict in templates/base/footer.tmpl
Auto-merging templates/.VERSION
CONFLICT (content): Merge conflict in templates/.VERSION
Removing scripts/less.sh
Removing scripts/gogs_supervisord.sh
Removing routers/user/social.go
Auto-merging routers/user/setting.go
Auto-merging routers/user/auth.go
CONFLICT (content): Merge conflict in routers/user/auth.go
Auto-merging routers/repo/setting.go
CONFLICT (content): Merge conflict in routers/repo/setting.go
Auto-merging routers/repo/issue.go
CONFLICT (content): Merge conflict in routers/repo/issue.go
Auto-merging routers/home.go
CONFLICT (content): Merge conflict in routers/home.go
Auto-merging routers/api/v1/user/app.go
CONFLICT (modify/delete): routers/api/v1/user.go deleted in upstream/master and modified in HEAD. Version HEAD of routers/api/v1/user.go left in tree.
CONFLICT (modify/delete): routers/api/v1/repo_hooks.go deleted in upstream/master and modified in HEAD. Version HEAD of routers/api/v1/repo_hooks.go left in tree.
Removing routers/api/v1/repo_file.go
CONFLICT (modify/delete): routers/api/v1/repo.go deleted in upstream/master and modified in HEAD. Version HEAD of routers/api/v1/repo.go left in tree.
Removing routers/api/v1/miscellaneous.go
Auto-merging public/plugins/pdfjs-1.4.20/LICENSE
Removing public/ng/less/ui/var.less
Removing public/ng/less/ui/table.less
Removing public/ng/less/ui/reset.less
Removing public/ng/less/ui/panel.less
Removing public/ng/less/ui/pager.less
Removing public/ng/less/ui/menu.less
Removing public/ng/less/ui/label.less
Removing public/ng/less/ui/grid.less
Removing public/ng/less/ui/form.less
Removing public/ng/less/ui/bread.less
Removing public/ng/less/ui/alert.less
Removing public/ng/less/ui.less
Removing public/ng/less/gogs/sign.less
Removing public/ng/less/gogs/settings.less
Removing public/ng/less/gogs/repository.less
Removing public/ng/less/gogs/profile.less
Removing public/ng/less/gogs/organization.less
Removing public/ng/less/gogs/markdown.less
Removing public/ng/less/gogs/issue.less
Removing public/ng/less/gogs/external.less
Removing public/ng/less/gogs/dashboard.less
Removing public/ng/less/gogs/base.less
Removing public/ng/less/gogs/admin.less
Removing public/ng/less/gogs.less
Removing public/ng/js/utils/tabs.js
Removing public/ng/js/utils/preview.js
Removing public/ng/js/min/gogs-min.js
Removing public/ng/js/lib/lib.js
Removing public/ng/js/lib/jquery.tipsy.js
Removing public/ng/js/lib/jquery.magnific-popup.min.js
Removing public/ng/js/lib/jquery-1.11.1.min.js
Removing public/ng/js/gogs/issue_label.js
Removing public/ng/js/gogs.js
Removing public/ng/fonts/octicons.woff
Removing public/ng/fonts/octicons.ttf
Removing public/ng/fonts/octicons.svg
Removing public/ng/fonts/octicons.eot
Removing public/ng/fonts/octicons.css
Removing public/ng/fonts/fontawesome-webfont.woff
Removing public/ng/fonts/fontawesome-webfont.ttf
Removing public/ng/fonts/fontawesome-webfont.svg
Removing public/ng/fonts/fontawesome-webfont.eot
Removing public/ng/fonts/FontAwesome.otf
Removing public/ng/css/ui.css
Removing public/ng/css/tipsy.css
Removing public/ng/css/magnific-popup.css
Removing public/ng/css/gogs.css
Removing public/less/_octicons.less
Removing public/js/semantic.min.js
Removing public/js/min/gogs-min.js
Removing public/js/locales/bootstrap-datepicker.zh-TW.js
Removing public/js/locales/bootstrap-datepicker.zh-CN.js
Removing public/js/locales/bootstrap-datepicker.vi.js
Removing public/js/locales/bootstrap-datepicker.ua.js
Removing public/js/locales/bootstrap-datepicker.tr.js
Removing public/js/locales/bootstrap-datepicker.th.js
Removing public/js/locales/bootstrap-datepicker.sw.js
Removing public/js/locales/bootstrap-datepicker.sv.js
Removing public/js/locales/bootstrap-datepicker.sq.js
Removing public/js/locales/bootstrap-datepicker.sl.js
Removing public/js/locales/bootstrap-datepicker.sk.js
Removing public/js/locales/bootstrap-datepicker.ru.js
Removing public/js/locales/bootstrap-datepicker.rs.js
Removing public/js/locales/bootstrap-datepicker.rs-latin.js
Removing public/js/locales/bootstrap-datepicker.ro.js
Removing public/js/locales/bootstrap-datepicker.pt.js
Removing public/js/locales/bootstrap-datepicker.pt-BR.js
Removing public/js/locales/bootstrap-datepicker.pl.js
Removing public/js/locales/bootstrap-datepicker.no.js
Removing public/js/locales/bootstrap-datepicker.nl.js
Removing public/js/locales/bootstrap-datepicker.nl-BE.js
Removing public/js/locales/bootstrap-datepicker.nb.js
Removing public/js/locales/bootstrap-datepicker.ms.js
Removing public/js/locales/bootstrap-datepicker.mk.js
Removing public/js/locales/bootstrap-datepicker.lv.js
Removing public/js/locales/bootstrap-datepicker.lt.js
Removing public/js/locales/bootstrap-datepicker.kr.js
Removing public/js/locales/bootstrap-datepicker.kk.js
Removing public/js/locales/bootstrap-datepicker.ka.js
Removing public/js/locales/bootstrap-datepicker.ja.js
Removing public/js/locales/bootstrap-datepicker.it.js
Removing public/js/locales/bootstrap-datepicker.is.js
Removing public/js/locales/bootstrap-datepicker.id.js
Removing public/js/locales/bootstrap-datepicker.hu.js
Removing public/js/locales/bootstrap-datepicker.hr.js
Removing public/js/locales/bootstrap-datepicker.he.js
Removing public/js/locales/bootstrap-datepicker.gl.js
Removing public/js/locales/bootstrap-datepicker.fr.js
Removing public/js/locales/bootstrap-datepicker.fi.js
Removing public/js/locales/bootstrap-datepicker.fa.js
Removing public/js/locales/bootstrap-datepicker.et.js
Removing public/js/locales/bootstrap-datepicker.es.js
Removing public/js/locales/bootstrap-datepicker.el.js
Removing public/js/locales/bootstrap-datepicker.de.js
Removing public/js/locales/bootstrap-datepicker.da.js
Removing public/js/locales/bootstrap-datepicker.cy.js
Removing public/js/locales/bootstrap-datepicker.cs.js
Removing public/js/locales/bootstrap-datepicker.ca.js
Removing public/js/locales/bootstrap-datepicker.bg.js
Removing public/js/locales/bootstrap-datepicker.az.js
Removing public/js/locales/bootstrap-datepicker.ar.js
Removing public/js/lib.js
Removing public/js/jquery.validate.min.js
Removing public/js/jquery-1.11.2.min.js
Removing public/js/jquery-1.10.1.min.map
Removing public/js/jquery-1.10.1.min.js
Removing public/js/bootstrap.min.js
Removing public/js/bootstrap-datepicker.js
Removing public/js/bootstrap-colorpicker.min.js
Removing public/js/app.js
Removing public/js/ZeroClipboard.swf
Removing public/img/bootstrap-colorpicker/saturation.png
Removing public/img/bootstrap-colorpicker/hue.png
Removing public/img/bootstrap-colorpicker/hue-horizontal.png
Removing public/img/bootstrap-colorpicker/alpha.png
Removing public/img/bootstrap-colorpicker/alpha-horizontal.png
Removing public/img/avatar_default.jpg
Removing public/fonts/octicons.woff
Removing public/fonts/octicons.eot
Removing public/fonts/fontawesome-webfont.woff2
Removing public/fonts/fontawesome-webfont.woff
Removing public/fonts/fontawesome-webfont.eot
Removing public/fonts/FontAwesome.otf
Removing public/css/todc-bootstrap.min.css
Removing public/css/todc-bootstrap.css.map
Auto-merging public/css/themes/github/assets/fonts/octicons.ttf
Auto-merging public/css/themes/github/assets/fonts/octicons.svg
Removing public/css/semantic.min.css
Removing public/css/markdown.css
Removing public/css/gogs.min.css
Removing public/css/font-awesome.min.css
Removing public/css/datepicker3.css
Removing public/css/bootstrap.min.css
Removing public/css/bootstrap.css.map
Removing public/css/bootstrap-colorpicker.min.css
Auto-merging public/assets/font-awesome-4.6.3/fonts/fontawesome-webfont.ttf
Auto-merging public/assets/font-awesome-4.6.3/fonts/fontawesome-webfont.svg
Removing packager/debian/postinst
Removing modules/uuid/uuid_test.go
Removing modules/uuid/uuid.go
Removing modules/uuid/benchmarks_test.go
Removing modules/uuid/README.md
Auto-merging modules/user/user.go
Removing modules/social/social.go
Removing modules/middleware/org.go
Auto-merging modules/mailer/mailer.go
CONFLICT (content): Merge conflict in modules/mailer/mailer.go
Removing modules/mailer/mail.go
Removing modules/log/database.go
Removing modules/ldap/search.go
Removing modules/ldap/modify.go
Removing modules/ldap/ldap_test.go
Removing modules/ldap/ldap.go
Removing modules/ldap/filter_test.go
Removing modules/ldap/filter.go
Removing modules/ldap/debug.go
Removing modules/ldap/control.go
Removing modules/ldap/conn.go
Removing modules/ldap/bind.go
Removing modules/ldap/_examples/slapd.conf
Removing modules/ldap/_examples/searchTLS.go
Removing modules/ldap/_examples/searchSSL.go
Removing modules/ldap/_examples/search.go
Removing modules/ldap/_examples/modify.go
Removing modules/ldap/_examples/enterprise.ldif
Removing modules/ldap/README
Removing modules/ldap/LICENSE
Removing modules/httplib/httplib_test.go
Removing modules/git/version.go
Removing modules/git/utils.go
Removing modules/git/tree_entry.go
Removing modules/git/tree_blob.go
Removing modules/git/tree.go
Removing modules/git/tag.go
Removing modules/git/submodule.go
Removing modules/git/signature.go
Removing modules/git/sha1.go
Removing modules/git/repo_tree.go
Removing modules/git/repo_tag.go
Removing modules/git/repo_object.go
Removing modules/git/repo_commit.go
Removing modules/git/repo_branch.go
Removing modules/git/repo.go
Removing modules/git/hooks.go
Removing modules/git/commit_archive.go
CONFLICT (modify/delete): modules/git/commit.go deleted in upstream/master and modified in HEAD. Version HEAD of modules/git/commit.go left in tree.
Removing modules/git/blob.go
Removing modules/cron/spec_test.go
Removing modules/cron/spec.go
Removing modules/cron/parser_test.go
Removing modules/cron/parser.go
Removing modules/cron/manager.go
Removing modules/cron/doc.go
Removing modules/cron/cron_test.go
Removing modules/cron/constantdelay_test.go
Removing modules/cron/constantdelay.go
Auto-merging modules/context/repo.go
Auto-merging modules/context/context.go
Auto-merging modules/context/auth.go
CONFLICT (modify/delete): modules/base/template.go deleted in upstream/master and modified in HEAD. Version HEAD of modules/base/template.go left in tree.
Removing modules/base/markdown.go
Auto-merging modules/auth/user_form.go
CONFLICT (content): Merge conflict in modules/auth/user_form.go
Auto-merging modules/auth/pam/pam_stub.go
Removing modules/auth/ldap/ldap_test.go
Removing modules/auth/apiv1/miscellaneous.go
Removing modules/asn1-ber/ber.go
Removing modules/asn1-ber/README
Removing modules/asn1-ber/Makefile
Removing modules/asn1-ber/LICENSE
Auto-merging models/user.go
CONFLICT (content): Merge conflict in models/user.go
Removing models/slack.go
Auto-merging models/repo.go
CONFLICT (content): Merge conflict in models/repo.go
Removing models/publickey.go
Removing models/oauth2.go
Auto-merging models/issue.go
CONFLICT (content): Merge conflict in models/issue.go
Removing etc/supervisord.conf
Removing etc/mysql.sql
Removing docker/templates/init_gogs.sh.tpl
Removing docker/docker/.gitkeep
Removing docker/blocks/w_session/fig
Removing docker/blocks/w_none/fig
Removing docker/blocks/w_db_session/fig
Removing docker/blocks/w_db_cache_session/fig
Removing docker/blocks/w_db_cache/fig
Removing docker/blocks/w_db/fig
Removing docker/blocks/w_cache_session/fig
Removing docker/blocks/w_cache/fig
Removing docker/blocks/option_session_mysql/fig
Removing docker/blocks/option_session_mysql/config
Removing docker/blocks/option_db_postgresql/fig
Removing docker/blocks/option_db_postgresql/config
Removing docker/blocks/option_db_mysql/fig
Removing docker/blocks/option_db_mysql/config
Removing docker/blocks/option_cache_redis/fig
Removing docker/blocks/option_cache_redis/config
Removing docker/blocks/option_cache_memcache/fig
Removing docker/blocks/option_cache_memcache/config
Removing docker/blocks/docker_gogs_dev/Dockerfile
Removing docker/blocks/docker_gogs/Dockerfile
Removing docker/assemble_blocks.sh
Removing docker-compose.yml
Removing conf/license/Mozilla Public License Version 2.0
Removing conf/license/LGPL v3
Removing conf/license/LGPL v2.1
Removing conf/license/GPL v3
Removing conf/license/GPL v2
Removing conf/license/Eclipse Public License v1.0
Removing conf/license/CC0 1.0 Universal
Removing conf/license/BSD license
Removing conf/license/BSD (3-Clause) License
Removing conf/license/Affero GPL
Auto-merging conf/gitignore/Go
Removing conf/README
Auto-merging cmd/web.go
CONFLICT (content): Merge conflict in cmd/web.go
Auto-merging .gitignore
CONFLICT (content): Merge conflict in .gitignore
Auto-merging .github/CONTRIBUTING.md
Automatic merge failed; fix conflicts and then commit the result.
