merge conflict fix

This commit is contained in:
karthik.bhandary
2026-03-27 18:59:37 +00:00
parent 1633be5ddd
commit 53a1aac33c
+1 -1
View File
@@ -5,8 +5,8 @@
package org
import (
"fmt"
"errors"
"fmt"
"net/http"
activities_model "code.gitea.io/gitea/models/activities"