adityasharma7 commented on pull request #58: URL: https://github.com/apache/ofbiz-framework/pull/58#issuecomment-633592640
I have created a new PR resolving the conflicts https://github.com/apache/ofbiz-framework/pull/160 There was field entry added after the above PR. I tried with the above steps to resolve conflicts not sure why it didn't allow me to push to trunk. I will check later ---------------------------------------------------------------- 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
