mirror of
https://github.com/woodpecker-ci/woodpecker.git
synced 2024-06-02 21:49:25 +00:00
fix merge
This commit is contained in:
parent
0971baf749
commit
026c2cac8e
|
@ -113,7 +113,6 @@
|
|||
"xorm",
|
||||
"xormigrate",
|
||||
"zerolog",
|
||||
<<<<<<< HEAD
|
||||
"Msgf",
|
||||
"varchar",
|
||||
"autoincr",
|
||||
|
|
Loading…
Reference in a new issue