Changeset 397 for library/doc/html/inherit__graph__1.dot

Timestamp:

06/24/09 21:56:30 (15 years ago)

Author:

smidl

Message:

doc

Files:

• library/doc/html/inherit__graph__1.dot (modified) (1 diff)

library/doc/html/inherit__graph__1.dot

@@ -152 +152 @@
   Node7 -> Node74 [dir=back,color="midnightblue",fontsize="10",style="solid",fontname="FreeSans"];
   Node74 [label="bdm::RV",height=0.2,width=0.4,color="black", fillcolor="white", style="filled",URL="$classbdm_1_1RV.html",tooltip="Class representing variables, most often random variables."];
+<<<<<<< HEAD:library/doc/html/inherit__graph__1.dot
   Node7 -> Node75 [dir=back,color="firebrick4",fontsize="10",style="solid",fontname="FreeSans"];
   Node75 [label="bdm::SettingResolver",height=0.2,width=0.4,color="black", fillcolor="white", style="filled",URL="$classbdm_1_1SettingResolver.html",tooltip="This class serves to expand links used within configuration files."];
+=======
+>>>>>>> doc:library/doc/html/inherit__graph__1.dot
 }