diff options
| author | Xe Iaso <me@xeiaso.net> | 2025-01-19 08:20:18 -0500 |
|---|---|---|
| committer | Xe Iaso <me@xeiaso.net> | 2025-01-19 08:20:18 -0500 |
| commit | d9a76c12763bb118ca708afcb0863e334c011f39 (patch) | |
| tree | 8bfea4de8760cccdc5726b6ec66b6a1030fc42f9 /cmd | |
| parent | 1ee9605f156a5a13c34e9fd17a970227d60c681d (diff) | |
| download | x-d9a76c12763bb118ca708afcb0863e334c011f39.tar.xz x-d9a76c12763bb118ca708afcb0863e334c011f39.zip | |
cmd/anubis: oops, i hate git merges
Signed-off-by: Xe Iaso <me@xeiaso.net>
Diffstat (limited to 'cmd')
| -rw-r--r-- | cmd/anubis/main.go | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/cmd/anubis/main.go b/cmd/anubis/main.go index f9f090d..1956c83 100644 --- a/cmd/anubis/main.go +++ b/cmd/anubis/main.go @@ -136,11 +136,8 @@ func (s *Server) challengeFor(r *http.Request) string { r.Header.Get("Accept-Language"), r.Header.Get("X-Real-Ip"), r.UserAgent(), -<<<<<<< Updated upstream time.Now().UTC().Round(24*7*time.Hour).Format(time.RFC3339), -======= fp, ->>>>>>> Stashed changes ) result, _ := sha256sum(data) return result |