search

billuraksoy / virtual_lab

0 stars 1 forks source link

branch conflict #110

Closed billuraksoy closed 3 years ago

billuraksoy commented 3 years ago

I had made some text edits on the testing branch, but after your latest push, there is an issue with the branches now. Can you please fix it?

mcdaij commented 3 years ago

Sorry for the late reply, but just go ahead and overwrite the testing branch and I'll take care of it.

billuraksoy commented 3 years ago

It looks like you solved this issue. I am closing it. Screen Shot 2020-10-13 at 8 14 54 AM