update dontmerge preference
authorNicole C. Engard <nengard@gmail.com>
Thu, 21 Aug 2014 13:04:19 +0000 (08:04 -0500)
committerNicole C. Engard <nengard@gmail.com>
Thu, 21 Aug 2014 13:06:16 +0000 (08:06 -0500)
commita9ce0b15d35c138ae2b9208189aafc8c04db086e
tree0545b0369daeeb3b668e7c25bc4b63970d02180e
parenta7d5c2dc37ef39b89165f15eba3b35461eee2d64
update dontmerge preference

Conflicts:
en/manual.xml
en/manual.xml