Closed alyshahudson closed 4 years ago
Before opening a PR you'll need to do the following:
git merge origin/master
to make sure your branch is up to date
Then you can
git add .
git commit -m "fixes"
git push origin yourbranch
Please also reference the issue number "#+issue Number" on all PRs.
Thank you! PS. I have removed the /public/templates.js build file and included it in .gitignore. This file should not be included and was the reason for the merge conflict.
assigned fixes