Number: 2175
Title: CVS conflict in documentation
Submitter: Ryan Schmidt
Date: Wed Apr 27 05:56:36 2011
Subsys: Other
Version:
System: *-*-
Severity: cosmetic
Problem:
The documentation on the web site seems to contain a CVS conflict:

http://www.graphviz.org/content/attrs#krect

It says: 


<<<<<<< attrs
<DT><A NAME=kshape><STRONG>shape</strong></a>
<DD>A string specifying the <A HREF=/content/node-shapes>shape</a> of a node.
=======
<DT><A NAME=kshape><STRONG>shape</strong></a>
<DD>A string specifying the <A HREF=node-shapes>shape</a> of a node.
>>>>>>> >>>>>>> 1.133

I can't locate this in the files in the repository, so I assume the problem exists only on your web server.
Owner: *
Status: *