From: bangerth Date: Mon, 24 Sep 2012 13:35:10 +0000 (+0000) Subject: Set the merge properties to what is likely the correct value. X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0c0f0343e9e25e890b7747f645585762db76bff3;p=dealii-svn.git Set the merge properties to what is likely the correct value. git-svn-id: https://svn.dealii.org/branches/branch_cmake@26659 0785d39b-7218-0410-832d-ea1e28bc413d --- 0c0f0343e9e25e890b7747f645585762db76bff3