Merge remote-tracking branch 'origin/helloworld'
Conflicts: software/erp5/software.cfg software/erp5testnode/software.cfg Both files reverted back to master.
Showing
Please register or sign in to comment
Conflicts: software/erp5/software.cfg software/erp5testnode/software.cfg Both files reverted back to master.