[petsc-dev] mine/theirs error

[Satish Balay]

pushed a fix now.

satish

On Fri, 20 Aug 2010, Mike McCourt wrote:

> In the development copy of the documentation:
> http://www.mcs.anl.gov/petsc/petsc-as/snapshots/petsc-dev/docs/manualpages/singleindex.html
> there's a entry
> <<<<<<<
> which is related to using SuperLU for your solver.  I assume this is just an artifact of a conflict during a push.
> 
> -Mike
>