[yoda-svn] r338 - trunk/include/YODA

[blackhole at projects.hepforge.org]

Author: mkawalec
Date: Tue Aug 23 12:21:18 2011
New Revision: 338

Log:
Fixed a conflict in Axis1D

Modified:
   trunk/include/YODA/Axis1D.h

Modified: trunk/include/YODA/Axis1D.h
==============================================================================
--- trunk/include/YODA/Axis1D.h	Tue Aug 23 12:00:17 2011	(r337)
+++ trunk/include/YODA/Axis1D.h	Tue Aug 23 12:21:18 2011	(r338)
@@ -204,6 +204,7 @@
 
 
     /// Merge together the bin range with indices from @a from to @a to, inclusive
+    /// Merge a series of bins, between the bins identified by indexes from and to
     void mergeBins(size_t from, size_t to) {
       // Correctness checking
       if (from < 0 || from >= numBins()) throw ("First index is out of range!");