Fixed merge conflicts
Status | Name | Job ID | Coverage | ||||||
---|---|---|---|---|---|---|---|---|---|
Build | |||||||||
failed | Linux64-snapshot |
#7385
btcmerge2
|
00:38:22
|
|
|||||
failed | Win64-snapshot |
#7384
btcmerge
|
00:38:07
|
|
|||||
Name | Stage | Failure | ||
---|---|---|---|---|
failed
|
Linux64-snapshot | Build | ||
|
||||
failed
|
Win64-snapshot | Build | ||
|