Re: [boost] Merge conflicts for release

From: Douglas Gregor (gregod_at_[hidden])
Date: 2002-05-16 06:53:59

On Wednesday 15 May 2002 08:25 pm, David Abrahams wrote:

>               Conflict                boost/function/function_base.hpp
>               Conflict                boost/function/function_template.hpp
>               Conflict                libs/function/doc/tutorial.html

Fixed. 

        Doug