[Gomp-discuss] Re: [PATCH, gomp] Adding projects/gomp to documentation

[Andrew Pinski]

On Oct 17, 2004, at 1:04 PM, Scott Robert Ladd wrote:
> Index: htdocs/cvs.html
> ===================================================================
> RCS file: /cvs/gcc/wwwdocs/htdocs/cvs.html,v
> retrieving revision 1.157
> diff -u -3 -r1.157 cvs.html
> --- htdocs/cvs.html     16 Oct 2004 16:57:44 -0000      1.157
> +++ htdocs/cvs.html     17 Oct 2004 16:58:26 -0000
> @@ -227,6 +227,18 @@
> ....
> +<<<<<<< cvs.html
> +  ....
> +=======
> ....
> +>>>>>>> 1.157
>  </dl>
>
>  <h4>Architecture-specific</h4>


Did you forget to get rid of the conflict markers?

Thanks,
Andrew Pinski