resolved conflicts in: source/unres/src_MD/CMakeLists.txt
authorDawid Jagiela <lightnir@chem.univ.gda.pl>
Mon, 2 Sep 2013 15:05:23 +0000 (17:05 +0200)
committerDawid Jagiela <lightnir@chem.univ.gda.pl>
Mon, 2 Sep 2013 15:05:23 +0000 (17:05 +0200)
commitb027415aa4473b954abef46bec87d13b85b3192b
tree19e298a5b1f10cad55361da62f6c7d4635b3e44f
parent4d1af7875f88832552e868c042c6988762d80110
resolved conflicts in: source/unres/src_MD/CMakeLists.txt
source/unres/src_MD/CMakeLists.txt