merged

pub/src/curve.cpp

@@ -268,14 +268,8 @@ void COlc::curve_val_vec( vector<double>* ret, const vector<double>& vt,
                 S.push_xy( x, y );
             // interpolation:
             if ( S.size()<2 )
-<<<<<<< HEAD
                 throw errmsg + " returns only " + S(S.size()) + " valid lines";
-            cout << "DEB call intpol " << vt.front() << " .. " << vt.back() 
-                 << "\n";
-=======
-                throw "script returns only " + S(S.size()) + " lines";
             //cout << "DEB call intpol "<<vt.front()<<" .. "<<vt.back()<<"\n";
->>>>>>> 78b7b535579041588639493acc216d1d60a43cee
             S.intpol( vt, *ret );
         }
         fclose( F );