mirror of https://github.com/go-gitea/gitea
fix conflicts
This commit is contained in:
parent
d7cb37c8ba
commit
aa2b8c4855
|
@ -640,12 +640,24 @@
|
|||
|
||||
-
|
||||
id: 96
|
||||
repo_id: 60
|
||||
repo_id: 49
|
||||
type: 1
|
||||
created_unix: 946684810
|
||||
|
||||
-
|
||||
id: 97
|
||||
repo_id: 49
|
||||
type: 2
|
||||
created_unix: 946684810
|
||||
|
||||
-
|
||||
id: 98
|
||||
repo_id: 60
|
||||
type: 1
|
||||
created_unix: 946684810
|
||||
|
||||
-
|
||||
id: 99
|
||||
repo_id: 61
|
||||
type: 1
|
||||
created_unix: 946684810
|
||||
|
|
Loading…
Reference in New Issue