current head of master doesn't build because of committed merge conflict markers

ShabbyX / RTAI

(NO LONGER MAINTAINED) Clone of RTAI from https://www.rtai.org

28 stars 17 forks source link

Closed SebKuzminsky closed 11 years ago

SebKuzminsky commented 11 years ago

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.

ShabbyX commented 11 years ago

Yes, I fixed that yesterday here:

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.

SebKuzminsky commented 11 years ago

I fetched and now it works, thanks!