search

RehabMan / OS-X-Realtek-Network

Fork of Meize's RealtekRTL8111 Network driver for OS X
96 stars 28 forks source link

"Version control conflict marker in file" error #4

Closed iandrewt closed 6 years ago

iandrewt commented 6 years ago

I tried compiling this and Xcode 9.1 (running macOS 10.13.1 with the same SDK, I'm aware this isn't in your build environment list) found a version control conflict marker and errored out. Link is to where the marker was found

https://github.com/RehabMan/OS-X-Realtek-Network/blob/2b00e35a53f420baf90960c8d65614f2eb52e4fd/RealtekRTL8111/RealtekRTL8111.cpp#L1794

RehabMan commented 6 years ago

Crazy. No idea why it was still building here. Merge mistake fixed.