JacquesLeRoux commented on pull request #230: URL: https://github.com/apache/ofbiz-framework/pull/230#issuecomment-682351106
Hi Suraj, You need to merge trunk HEAD, conflicts here and locally: C:\projectsASF\Git\ofbiz-framework>git apply 230.patch error: patch failed: framework/common/src/main/java/org/apache/ofbiz/common/JsLanguageFilesMapping.java:31 error: framework/common/src/main/java/org/apache/ofbiz/common/JsLanguageFilesMapping.java: patch does not apply error: patch failed: themes/common-theme/template/JsLanguageFilesMapping.ftl:74 error: themes/common-theme/template/JsLanguageFilesMapping.ftl: patch does not apply Else after review sounds good to me TIA ---------------------------------------------------------------- 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
