CMakeLists.txt in merge state
Created by: hmartiro
The current commit does not build, due to a merge state in the version numbers in CMakeLists.txt introduced from d4e417.
<<<<<<< .working
set(libbarrett_VERSION_MAJOR 1)
set(libbarrett_VERSION_MINOR 3)
=======