xiaoxiang781216 commented on pull request #2158: URL: https://github.com/apache/incubator-nuttx/pull/2158#issuecomment-722086706
@acassis the conflicts is still here and merge button is gray from my browser. If you can merge it, just do it. ---------------------------------------------------------------- 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. For queries about this service, please contact Infrastructure at: us...@infra.apache.org