I just pulled phobos from github and got the following conflict in
win32.mak:
<<<<<<< HEAD
std\bitmanip.d std\typecons.d \
std\complex.d \
std\exception.d \
std\intrinsic.d \
std\process.d \
std\system.d \
std\encoding.d \
std\net\isemail.d
SRCS_2 = std\variant.d \
=======
std\encoding.d std\xml.d \
std\random.d std\regexp.d \
std\contracts.d std\exception.d \
std\intrinsic.d std\compiler.d std\cpuid.d \
std\process.d std\system.d std\concurrency.d
SRCS_3 = std\variant.d \
>>>>>>> 7d98998c57b7799a9f8a45a7d09e7405334aea97
I haven't changed that file, so there's either a problem on the server,
or I did something wrong. Does anyone know what the matter could be?
Andrei
_______________________________________________
phobos mailing list
[email protected]
http://lists.puremagic.com/mailman/listinfo/phobos
