Rev 5291: Fix previously unnoticed conflict in NEWS. in file:///home/vila/src/bzr/experimental/leaking-tests/

[Vincent Ladeuil]

At file:///home/vila/src/bzr/experimental/leaking-tests/

------------------------------------------------------------
revno: 5291
revision-id: v.ladeuil+lp at free.fr-20100623152259-mxa5d3xmhdkdanjq
parent: v.ladeuil+lp at free.fr-20100623082048-0xg8la2eupdf2j96
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: propagate-exceptions
timestamp: Wed 2010-06-23 17:22:59 +0200
message:
  Fix previously unnoticed conflict in NEWS.
-------------- next part --------------
=== modified file 'NEWS'
--- a/NEWS	2010-06-23 08:20:48 +0000
+++ b/NEWS	2010-06-23 15:22:59 +0000
@@ -179,18 +179,16 @@
 Testing
 *******
 
-<<<<<<< TREE
 * Add ``bzrlib.tests.fixtures`` to hold code for setting up objects
   to test.  (Martin Pool)
 
-* ``test_import_tariff`` now respects BZR_PLUGINS_AT and BZR_PLUGINS_DISABLE.
-  (Vincent Ladeuil, #595587)
-=======
 * HTTP test servers would not leak threads (and sockets) anymore. They
   won't hang on AIX anymore either.
   (Vincent Ladeuil, #405745)
 
->>>>>>> MERGE-SOURCE
+* ``test_import_tariff`` now respects BZR_PLUGINS_AT and BZR_PLUGINS_DISABLE.
+  (Vincent Ladeuil, #595587)
+
 
 bzr 2.2b3
 #########