diff options
| author | Unknwon <u@gogs.io> | 2017-11-16 22:22:38 -0500 |
|---|---|---|
| committer | Unknwon <u@gogs.io> | 2017-11-16 22:22:38 -0500 |
| commit | 3b8b8a2ee35b5ca603f02d5eaeac8c3d7334353d (patch) | |
| tree | 7c8486a3e82b20df34e1df316643aa32107f87a7 /conf/locale/locale_en-US.ini | |
| parent | 6f04ee879ca25fd798f85a4c701291adae561a1a (diff) | |
pull_request: able to ignore whitespace when check conflict (#4834)
Diffstat (limited to 'conf/locale/locale_en-US.ini')
| -rw-r--r-- | conf/locale/locale_en-US.ini | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/conf/locale/locale_en-US.ini b/conf/locale/locale_en-US.ini index 433754b3..9ae5c91c 100644 --- a/conf/locale/locale_en-US.ini +++ b/conf/locale/locale_en-US.ini @@ -739,6 +739,7 @@ settings.tracker_issue_style.numeric = Numeric settings.tracker_issue_style.alphanumeric = Alphanumeric settings.tracker_url_format_desc = You can use placeholder <code>{user} {repo} {index}</code> for user name, repository name and issue index. settings.pulls_desc = Enable pull requests to accept public contributions +settings.pulls.ignore_whitespace = Ignore changes in whitespace settings.pulls.allow_rebase_merge = Allow use rebase to merge commits settings.danger_zone = Danger Zone settings.cannot_fork_to_same_owner = You cannot fork a repository to its original owner. |