Index: library/doc/html/classbdm_1_1dirfilelog.html
===================================================================
--- library/doc/html/classbdm_1_1dirfilelog.html (revision 397)
+++ library/doc/html/classbdm_1_1dirfilelog.html (revision 398)
@@ -5,5 +5,5 @@
 <link href="doxygen.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.5.9 -->
+<!-- Generated by Doxygen 1.5.8 -->
 <script type="text/javascript">
 <!--
@@ -72,5 +72,5 @@
 <a href="#_details">More...</a>
 <p>
-<code>#include &lt;<a class="el" href="loggers_8h_source.html">loggers.h</a>&gt;</code>
+<code>#include &lt;<a class="el" href="loggers_8h-source.html">loggers.h</a>&gt;</code>
 <p>
 
@@ -230,13 +230,7 @@
 <p>
 returns an identifier which will be later needed for calling the <code><a class="el" href="classbdm_1_1logger.html#397c014b0aaf3581516e2a105d26a5c9" title="log this vector">logit()</a></code> function For empty <a class="el" href="classbdm_1_1RV.html" title="Class representing variables, most often random variables.">RV</a> it returns -1, this entry will be ignored by <code><a class="el" href="classbdm_1_1logger.html#397c014b0aaf3581516e2a105d26a5c9" title="log this vector">logit()</a></code>. 
-<<<<<<< HEAD:library/doc/html/classbdm_1_1dirfilelog.html
-<p>References <a class="el" href="bdmbase_8h_source.html#l00569">bdm::logger::entries</a>, and <a class="el" href="bdmbase_8h_source.html#l00571">bdm::logger::names</a>.</p>
-
-<p>Referenced by <a class="el" href="datasources_8h_source.html#l00191">bdm::ArxDS::log_add()</a>, <a class="el" href="bdmbase_8h_source.html#l00819">bdm::BM::log_add()</a>, and <a class="el" href="bdmbase_8h_source.html#l00686">bdm::DS::log_add()</a>.</p>
-=======
 <p>References <a class="el" href="bdmbase_8h-source.html#l00123">bdm::RV::_dsize()</a>, <a class="el" href="bdmbase_8h-source.html#l00569">bdm::logger::entries</a>, and <a class="el" href="bdmbase_8h-source.html#l00571">bdm::logger::names</a>.</p>
 
 <p>Referenced by <a class="el" href="datasources_8h-source.html#l00191">bdm::ArxDS::log_add()</a>, <a class="el" href="bdmbase_8h-source.html#l00819">bdm::BM::log_add()</a>, and <a class="el" href="bdmbase_8h-source.html#l00686">bdm::DS::log_add()</a>.</p>
->>>>>>> doc:library/doc/html/classbdm_1_1dirfilelog.html
 
 </div>
@@ -269,5 +263,5 @@
 <p>Reimplemented from <a class="el" href="classbdm_1_1memlog.html#7352b474bc54c35ab7c9297c5b958629">bdm::memlog</a>.</p>
 
-<p>References <a class="el" href="loggers_8h_source.html#l00097">dirname</a>, <a class="el" href="loggers_8h_source.html#l00032">bdm::memlog::maxlen</a>, and <a class="el" href="loggers_8h_source.html#l00099">scalarnames</a>.</p>
+<p>References <a class="el" href="loggers_8h-source.html#l00097">dirname</a>, <a class="el" href="loggers_8h-source.html#l00032">bdm::memlog::maxlen</a>, and <a class="el" href="loggers_8h-source.html#l00099">scalarnames</a>.</p>
 
 </div>
@@ -298,24 +292,16 @@
 </dl>
 
-<<<<<<< HEAD:library/doc/html/classbdm_1_1dirfilelog.html
-<p>References <a class="el" href="loggers_8h_source.html#l00097">dirname</a>, <a class="el" href="bdmbase_8h_source.html#l00569">bdm::logger::entries</a>, <a class="el" href="loggers_8h_source.html#l00032">bdm::memlog::maxlen</a>, <a class="el" href="loggers_8h_source.html#l00099">scalarnames</a>, and <a class="el" href="loggers_8h_source.html#l00036">bdm::memlog::vectors</a>.</p>
-=======
 <p>References <a class="el" href="loggers_8h-source.html#l00097">dirname</a>, <a class="el" href="bdmbase_8h-source.html#l00569">bdm::logger::entries</a>, <a class="el" href="loggers_8h-source.html#l00032">bdm::memlog::maxlen</a>, <a class="el" href="loggers_8h-source.html#l00099">scalarnames</a>, and <a class="el" href="loggers_8h-source.html#l00036">bdm::memlog::vectors</a>.</p>
->>>>>>> doc:library/doc/html/classbdm_1_1dirfilelog.html
-
-<p>Referenced by <a class="el" href="loggers_8cpp_source.html#l00155">finalize()</a>, <a class="el" href="loggers_8cpp_source.html#l00046">init()</a>, and <a class="el" href="loggers_8cpp_source.html#l00144">step()</a>.</p>
+
+<p>Referenced by <a class="el" href="loggers_8cpp-source.html#l00155">finalize()</a>, <a class="el" href="loggers_8cpp-source.html#l00046">init()</a>, and <a class="el" href="loggers_8cpp-source.html#l00144">step()</a>.</p>
 
 </div>
 </div><p>
 <hr>The documentation for this class was generated from the following files:<ul>
-<li><a class="el" href="loggers_8h_source.html">loggers.h</a><li>loggers.cpp</ul>
-</div>
-<<<<<<< HEAD:library/doc/html/classbdm_1_1dirfilelog.html
-<hr size="1"><address style="text-align: right;"><small>Generated on Wed Jun 24 13:35:49 2009 for mixpp by&nbsp;
-=======
-<hr size="1"><address style="text-align: right;"><small>Generated on Tue Jun 23 19:52:52 2009 for mixpp by&nbsp;
->>>>>>> doc:library/doc/html/classbdm_1_1dirfilelog.html
+<li><a class="el" href="loggers_8h-source.html">loggers.h</a><li>loggers.cpp</ul>
+</div>
+<hr size="1"><address style="text-align: right;"><small>Generated on Wed Jun 24 21:53:05 2009 for mixpp by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.9 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.8 </small></address>
 </body>
 </html>
