github/woodpecker
1
0
Fork 0
mirror of https://github.com/woodpecker-ci/woodpecker.git synced 2025-10-25 23:49:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix merge conflicts

Browse Source
This commit is contained in:
Brad Rydzewski
2017-05-23 14:43:50 +02:00
parent 110c036e4e 2341e09def
commit 3f45889ead
79 changed files with 1131 additions and 2638 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
store/datastore/sql/postgres/sql_gen.go
View File

@@ -165,7 +165,7 @@ SELECT
,proc_environ
FROM procs
WHERE proc_build_id = $1
ORDER BY proc_pid ASC
ORDER BY proc_id ASC
`
var procsFindBuildPid = `