mirror of
https://github.com/go-gitea/gitea.git
synced 2026-05-12 04:43:32 +02:00
merge conflict fix
This commit is contained in:
parent
1633be5ddd
commit
53a1aac33c
@ -5,8 +5,8 @@
|
||||
package org
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
"errors"
|
||||
"fmt"
|
||||
"net/http"
|
||||
|
||||
activities_model "code.gitea.io/gitea/models/activities"
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user