Can you explain in detail how you updated to branch "rel3"?
Regards Rolf _______________________________________________ SQL-Ledger mailing list [email protected] http://lists.ledger123.com/mailman/listinfo/sql-ledger
You have merge conflicts in your files. You probably edited the files,
made a commit and your changes are not compatible with the code you
download from Github.
- [SQL-Ledger] New rel3 updates: Date picker, autocomplete, d... Armaghan Saqib
- [SQL-Ledger] git success, login failure, file corrupti... Reed Loefgren
- [SQL-Ledger] Re: git success, login failure, file ... Rolf Stöckli
- [SQL-Ledger] Re: git success, login failure, f... Reed Loefgren
- [SQL-Ledger] Re: git success, login failur... Armaghan Saqib
- [SQL-Ledger] Re: git success, login f... Reed Loefgren
