remove svnmerge properties
commit4cc91c7fdc595b3df1cdf14601f26632b10f172b
authorbenjamin.peterson <benjamin.peterson@6015fed2-1504-0410-9fe1-9d1591cc4771>
Sat, 27 Jun 2009 22:18:44 +0000 (27 22:18 +0000)
committerbenjamin.peterson <benjamin.peterson@6015fed2-1504-0410-9fe1-9d1591cc4771>
Sat, 27 Jun 2009 22:18:44 +0000 (27 22:18 +0000)
tree0786a71783143789cfd744977f800fff8815c08e
parent4a3af26b13102a5dd97c300a153dcf97fc99008a
remove svnmerge properties

git-svn-id: http://svn.python.org/projects/python/branches/release31-maint@73586 6015fed2-1504-0410-9fe1-9d1591cc4771