diff options
| author | Unknwon <u@gogs.io> | 2015-02-28 22:25:10 -0500 |
|---|---|---|
| committer | Unknwon <u@gogs.io> | 2015-02-28 22:25:10 -0500 |
| commit | a6a2f59d1da927a1fae9d009f58e63881c4c029a (patch) | |
| tree | 0587d3bb75fc9605c0e1c659e5044b63eaf51880 /models | |
| parent | b0b11fd7b1bd5e556c27ccae73668b7df74cd73e (diff) | |
| parent | d446be9f5f1e4584c329dc418a9699960cb431e1 (diff) | |
| download | gitea-a6a2f59d1da927a1fae9d009f58e63881c4c029a.tar.gz gitea-a6a2f59d1da927a1fae9d009f58e63881c4c029a.zip | |
Merge branch 'access' of github.com:gogits/gogs into dev
Diffstat (limited to 'models')
| -rw-r--r-- | models/publickey.go | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/models/publickey.go b/models/publickey.go index 383b85b634..6bec1139b8 100644 --- a/models/publickey.go +++ b/models/publickey.go @@ -130,7 +130,6 @@ func extractTypeFromBase64Key(key string) (string, error) { // Parse any key string in openssh or ssh2 format to clean openssh string (rfc4253) func ParseKeyString(content string) (string, error) { - // Transform all legal line endings to a single "\n" s := strings.Replace(strings.Replace(strings.TrimSpace(content), "\r\n", "\n", -1), "\r", "\n", -1) |