freakishness commented on PR #9761: URL: https://github.com/apache/nuttx/pull/9761#issuecomment-1937779258
> >  I don't understand why adding code here would cause a conflict > > since other people modify the same code line. you need fix all conflict manually. i > >  I don't understand why adding code here would cause a conflict > > since other people modify the same code line. you need fix all conflict manually. I have copied the contents of this file from the master branch and added this line.Still showing conflict. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@nuttx.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
