Test to fix svn commit problems

gsherman · gsherman · commit 64b15e48272f · 2008-01-29T05:06:03.000Z
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@8084 c8812cc2-4d05-0410-92ff-de0c093fc19c
diff --git a/PROVENANCE b/PROVENANCE
@@ -6,7 +6,12 @@ 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
