Closed SebKuzminsky closed 11 years ago
Yes, I fixed that yesterday here:
https://github.com/ShabbyX/RTAI/commit/e7406bfc66bc263b064960e1ea0ebda20451eaed
Unfortunately, just as I was about to test the merge I had to leave and hadn't had time yet. Let me know if there are any other issues.
I fetched and now it works, thanks!
It stops on base/arch/x86/hal/hal_x86.c:1690 for me
"git grep '^<<<<<' origin/master" identifies two more merge conflict markers in master.