Cleanup after all the svn troubleshooting

git-svn-id: http://svn.osgeo.org/qgis/trunk@8085 c8812cc2-4d05-0410-92ff-de0c093fc19c
qgis · Jan 29, 2008 · ca974c5 · ca974c5
1 parent e86bbdc
commit ca974c5
Showing 1 changed file with 0 additions and 6 deletions.
diff --git a/PROVENANCE b/PROVENANCE
@@ -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