Merge branch 'master' of https://github.com/prati0100/git-gui

diff --git a/Documentation/config/gpg.txt b/Documentation/config/gpg.txt
index 5378a528b0b7cb1586b8c898b8918f244b9123b5..cce2c8924598c240fcebfadea8be5b4b28ce378e 100644 (file)
--- a/Documentation/config/gpg.txt
+++ b/Documentation/config/gpg.txt
@@ -16,5 +16,5 @@ gpg.format::
 gpg.<format>.program::
        Use this to customize the program used for the signing format you
        chose. (see `gpg.program` and `gpg.format`) `gpg.program` can still
-       be used as a legacy synonym for `gpg.openpgp.program`. The default
+       be used as a legacy synonym for `gpg.openpgp.program`. The default
        value for `gpg.x509.program` is "gpgsm".