commit into mysql-6.0 branch (kgeorge:2660)

[Georgi Kodinov]

#At file:///Users/kgeorge/mysql/bzr/merge-6.0-bugteam/

 2660 Georgi Kodinov	2008-05-28
      fixed a resolve problem
modified:
  .bzr-mysql/default.conf

=== modified file '.bzr-mysql/default.conf'
--- a/.bzr-mysql/default.conf	2008-05-28 15:04:33 +0000
+++ b/.bzr-mysql/default.conf	2008-05-28 15:13:18 +0000
@@ -1,11 +1,4 @@
-<<<<<<< TREE
 [MYSQL]
 post_commit_to = "commits@stripped"
 post_push_to = "commits@stripped"
 tree_name = "mysql-6.0"
-=======
-[MYSQL]
-post_commit_to = "commits@stripped"
-post_push_to = "commits@stripped"
-tree_name = "mysql-5.1"
->>>>>>> MERGE-SOURCE