Commit d4a04185 authored by Florian Weik's avatar Florian Weik

Merge cleanup.

parent 6b7dd38e
......@@ -101,11 +101,6 @@ static double calc_pwdist(Particle *p1, Bonded_ia_parameters *iaparams, int *clc
*clconstr = k;
}
}
/*fprintf(stdout," k=%d clconstr=%d\n",k,*clconstr);*/
<<<<<<< HEAD
break;
=======
>>>>>>> 77559ba... fixed ambiguous pow-calls and warnings
}
}
/*
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment