From 3f42619e802b9dc13dc4dd770d419a0e4e9fce9d Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Tue, 4 Sep 2012 09:20:19 +1000
Subject: [PATCH] docs: Remove merged-branches.txt

We are now well past simply having two projects in once tree, and each
continued reference to 'samba3' and 'samba4' causes user confusion.

Andrew Bartlett
---
 merged-branches.txt | 6 ------
 1 file changed, 6 deletions(-)
 delete mode 100644 merged-branches.txt

diff --git a/merged-branches.txt b/merged-branches.txt
deleted file mode 100644
index 064203f6720..00000000000
--- a/merged-branches.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-This branch contains sources for both Samba 3 and Samba 4. The Samba 3
-source/ folder is now called source3, the samba4 source/ folder is called
-source4.
-
-The aim is to move shared code to a common location
-and hopefully combine Samba3 and Samba 4 step by step.
-- 
2.11.4.GIT