$ grep CONFLICT UPGRADE-NOTES/auto-merge-result > UPGRADE-NOTES/merge-conflicts

CONFLICT (content): Merge conflict in templates/user/settings/profile.tmpl
notabug modifications:
* e44746ab29d3f3efa24d7d0e1aa4421add8fcaea - Add hide email option
resolutions:
* re-added hide email form field back onto upstream version

CONFLICT (content): Merge conflict in templates/user/profile.tmpl
notabug modifications:
* 419068322d92dc54d9704459f97de7c84f4f0b3e - Actually hide email address on the profile page 
resolutions:
* re-added {{if not .Owner.HideEmail}} guard back onto upstream version

CONFLICT (content): Merge conflict in templates/user/dashboard/feeds.tmpl
notabug modifications:
* 26bc9aa485279ea5d46938e75efe64e2f6be9617 - Force suburl in feed. Workaround for an unkown bug.
resolutions:
* kept upstream version
* the original notabug modification was reverted with last upstream merge

CONFLICT (content): Merge conflict in templates/user/auth/signup.tmpl
notabug modifications:
* 2c11a00bac36cbe58c7d89cb7bdc5ab0bf8ed7f6 - Disable captchas fixes #47 
resolutions:
* kept upstream version
* upstream version now guards with {{if .EnableCaptcha}}

CONFLICT (content): Merge conflict in templates/status/404.tmpl
notabug modifications:
* 5a35923ec0db78c2a13f65cc6fa6cbd1b9846dbd - Remove more github references
resolutions:
* kept upstream version but changed link to issue tracker

CONFLICT (content): Merge conflict in templates/repo/settings/hook_new.tmpl
notabug modifications:
* b9aa14f1fb9150d3c589a46016602519ca3a6cb0 - Remove 'slack' webhook type
resolutions:
* kept upstream version but removed references to slack

CONFLICT (content): Merge conflict in templates/repo/issue/view.tmpl
notabug modifications:
* 73303c337f961ac624a3eab6940baa4911d23465 - Remove 'owner' tag from issues 
resolutions:
* none - differences were too great - merge conflict left in place

CONFLICT (content): Merge conflict in templates/repo/issue/list.tmpl
notabug modifications:
* 6076e5c748787dea49df567f5a1b8fc272218fd2 - Fix building on newer versions of ubuntu
resolutions:
* none - differences were too great - merge conflict left in place


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.

CONFLICT (content): Merge conflict in templates/home.tmpl
notabug modifications:
* 102668e6f1a4555f4640b4581e4b4861079ab652 - Revert holiday spiders
* 014e3e4461115877be1d313c40c035f7d1690da9 - Explain the holiday spiders
* 5227792d2a0957e4310d480658b2a79fee8e72b6 - Add 'powered by gogs' to the main page
* 9e3d35c63409c09aecea7a956d7c9b622da8b2b0 - Change peers name on main page
* 445faf40ac4fa2ebdfb702e41d50348fdb68352c - Resize peers logo in main page
* 23dbc580557f5a9cb5c9eec23b6907776a804999 - Add peers community reference to main page
* 20b9341dcb9d9026cc4a37faecc3cfb08a9d4588 - Change flavor text
* 84c12065943954163bbe234c12d7d8db89de5c79 - Add new logo
resolutions:
TODO:

CONFLICT (content): Merge conflict in templates/base/head.tmpl
TODO:

CONFLICT (content): Merge conflict in templates/base/footer.tmpl
TODO:

CONFLICT (content): Merge conflict in templates/.VERSION
TODO:

CONFLICT (content): Merge conflict in routers/user/auth.go
notabug modifications:
* 2c11a00bac36cbe58c7d89cb7bdc5ab0bf8ed7f6 - Disable captchas fixes #47
resolutions:
* kept notabug version
* NOTE: upstream has added 'setting.Service.EnableCaptcha' flag

CONFLICT (content): Merge conflict in routers/repo/setting.go
TODO:

CONFLICT (content): Merge conflict in routers/repo/issue.go
TODO:

CONFLICT (content): Merge conflict in routers/home.go
TODO:

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.
notabug modifications:
* 6076e5c748787dea49df567f5a1b8fc272218fd2 - Fix building on newer versions of ubuntu
resolutions:
* kept upstream version
* the functionality in this files has been moved to routers/api/v1/user/user.go
* upstream has entirely removed the 'ToApiUser()' function where the notabug patch was relevant
* the notabug patch changed a key in the 'api.User' struct from 'Id' to ID' - upstream now uses the same key

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.
notabug modifications:
* 6076e5c748787dea49df567f5a1b8fc272218fd2 - Fix building on newer versions of ubuntu
resolutions:
* kept upstream version
* the functionality in this files has been moved to routers/api/v1/repo/hook.go 
* upstream has entirely removed the code block where the notabug patch was relevant
* the notabug patch changed a key in the 'api.Hook' struct from 'Id' to ID' - upstream now uses the same key

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.
notabug modifications:
* 6076e5c748787dea49df567f5a1b8fc272218fd2 - Fix building on newer versions of ubuntu
resolutions:
* kept upstream version
* the functionality in this files has been moved to routers/api/v1/repo/repo.go
* the notabug patch changed a key in 'CreateRepo()' function from 'Gitignore' to 'Gitignores' - upstream now uses the same key

CONFLICT (content): Merge conflict in modules/mailer/mailer.go
notabug modifications:
* 8effc632db91617da41bec66c711146cc976ca81 - Add some missing headers to outgoing emails 
resolutions:
* kept upstream version
* notabug modification added import "time" now present in upstream version
* notabug modification added 'Date' and 'Message-Id' data to the string returned  from  'Content()' function which no longer exists
* 'Content()' function seems to have been replaced with a 'NewMessageFrom()' function returning a 'Message' struct
* the upstream version now puts a date in the 'Message' struct but the 'Message-Id' data will need to be re-implemented if it was important

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.
TODO:

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.
TODO:

CONFLICT (content): Merge conflict in modules/auth/user_form.go
TODO:

CONFLICT (content): Merge conflict in models/user.go
TODO:

CONFLICT (content): Merge conflict in models/repo.go
TODO:

CONFLICT (content): Merge conflict in models/issue.go
TODO:

CONFLICT (content): Merge conflict in cmd/web.go
TODO:

CONFLICT (content): Merge conflict in .gitignore
TODO:
