bzr commit into mysql_plugins branch (joerg:123)

[Joerg Bruehe]

#At file:///home/joerg/.bazaar/plugins/mysql_plugins/

  123 Joerg Bruehe	2008-06-23 [merge]
      Pull (merge) from central tree.
modified:
  sanity.py

=== modified file 'sanity.py'
--- a/sanity.py	2008-06-12 19:54:28 +0000
+++ b/sanity.py	2008-06-20 16:32:51 +0000
@@ -12,7 +12,6 @@ def sanity_check_file(tree, path, unreso
 		if ln.startswith('=======') and not ln.startswith('========'):
 			if state == 1:
 				state = 2
-			potentially_unresolved.add(path)
 		if ln.startswith('>>>>>>>') and not ln.startswith('>>>>>>>>'):
 			if state == 2:
 				unresolved.add(path)