Rev 452: remove conflict marker. in file:///data/jelmer/bzr-svn/nestedtrees/

[Jelmer Vernooij]

At file:///data/jelmer/bzr-svn/nestedtrees/

------------------------------------------------------------
revno: 452
revision-id:jelmer at samba.org-20080318175024-egfahp63avcl1fri
parent: jelmer at samba.org-20080318174944-z4nao45xaphb8q0m
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: nestedtrees
timestamp: Tue 2008-03-18 18:50:24 +0100
message:
  remove conflict marker.
modified:
  NEWS                           news-20061231030336-h9fhq245ie0de8bs-1
=== modified file 'NEWS'
--- a/NEWS	2008-03-18 17:49:44 +0000
+++ b/NEWS	2008-03-18 17:50:24 +0000
@@ -129,7 +129,6 @@
 
 
 bzr-svn 0.4.4	2007-11-02
->>>>>>> MERGE-SOURCE
 
   PERFORMANCE