Closed mark4carter closed 9 years ago
Please pull in the latest changes from upstream/split-version branch and remove all changes but js/utilities/LocateUser.js.
(assuming your upstream is the Code4HR repo and your current branch is brows-test)
git pull upstream/split-version
Resolve any merge conflicts. Reference this for further instruction.
Unstage the files that aren't LocateUser.js. I've included this as a reference.
Commit any changes and push to this branch.
Please pull in the latest changes from upstream/split-version branch and remove all changes but js/utilities/LocateUser.js.
(assuming your upstream is the Code4HR repo and your current branch is brows-test)
Resolve any merge conflicts. Reference this for further instruction.
Unstage the files that aren't LocateUser.js. I've included this as a reference.
Commit any changes and push to this branch.