You can now issue a merge of the pull request I have sent you:
https://github.com/msquared-id-au/frontaccounting/pull/1
Gist of what I have done:
1. Logged into my GitHub repo
2. Browsed into your repo
3. Issued a pull request from your GitHub repo to mine
4. Reached my repo and merged the incoming pull
5. Edited one file in the merged set that came from your repo and committed it in my repo
6. Issued a pull request from my GitHub repo to yours
7. Reached your repo and found the pull in order awaiting your logging in and merge to make both our repos in sync.
At anytime, you can view the state of all repos from your repo's perspective graphically at:
https://github.com/msquared-id-au/frontaccounting/network
My textcart commit is at:
https://github.com/apmuthu/frontaccounting/commit/31549aeaf0df9cac6e90cfcfe9a5ee108a614e73
My ldap changed file commit is at:
https://github.com/apmuthu/frontaccounting/commit/0c3d58e50e840248b937ac641ddf2203879df721