yeti icon indicating copy to clipboard operation
yeti copied to clipboard

Published 20 hours ago • verified publisher icon yeti-platform

github feeds

Open doomedraven opened this issue 6 years ago • 6 comments

doomedraven avatar Jun 15 '19 08:06 doomedraven

@tomchop this is dependends on https://github.com/yeti-platform/yeti/pull/463 to successfully build

doomedraven avatar Jun 17 '19 06:06 doomedraven

Please resolve conflicts and push

tomchop avatar Jul 24 '19 21:07 tomchop

it doens't allow me to resolve conflicts Screenshot 2019-07-25 at 08 08 49

doomedraven avatar Jul 25 '19 06:07 doomedraven

Yeah, you need to resolve them manually (i.e. not through the GitHub interface). I'll try to do it to day

tomchop avatar Jul 25 '19 10:07 tomchop

that is hard working see what is wrong, what i can do is remove this 2, and then add them in another pr

doomedraven avatar Jul 25 '19 10:07 doomedraven

ok now you can merge it

doomedraven avatar Jul 25 '19 10:07 doomedraven