aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--cmd/anubis/main.go3
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