On 10/25/12 14:02 , Oliver Bock wrote: > Have a look at your merges so far: 4f422d5, e273e4f, 22fe7a0. All of > them had a merge conflict in that file -- which is to be expected as you > all make your updates at the top of the file.
Well, bottom, even worse. _______________________________________________ boinc_dev mailing list [email protected] http://lists.ssl.berkeley.edu/mailman/listinfo/boinc_dev To unsubscribe, visit the above URL and (near bottom of page) enter your email address.
