|
|
Boost-Build : |
Subject: Re: [Boost-build] [boost-build][svn] Property conflict inmath/special_functions
From: John Maddock (boost.regex_at_[hidden])
Date: 2012-03-27 07:40:59
> when I was doing an svn-update (tortoise-svn) on
> boost/branches/release I got property conflicts in
> math/special_functions which is weird, because I never touched those
> areas of boost in any way.
>
> What do I do to resolve these conflicts?
I've never figured that out myself, and we haven't touched those files for a
while either, so I'm not sure why you're seeing conflicts :-(
John.
Boost-Build list run by bdawes at acm.org, david.abrahams at rcn.com, gregod at cs.rpi.edu, cpdaniel at pacbell.net, john at johnmaddock.co.uk