Cleanup after all the svn troubleshooting

git-svn-id: http://svn.osgeo.org/qgis/trunk@8085 c8812cc2-4d05-0410-92ff-de0c093fc19c
This commit is contained in:
gsherman 2008-01-29 05:09:05 +00:00
parent e86bbdc94b
commit ca974c5315

View File

@ -6,12 +6,6 @@ should not be included in release packages.
This file is in MediaWiki format for inclusion on the OSGEO wiki.
-->
Note the authoritative copy of this document is stored in the QGIS repository.
<<<<<<< .mine
=======
>>>>>>> .r8083
= Committers Past and Present =
dassau - Otto Dassau
ersts - Peter Ersts