From: Andrew Bartlett <abartlet@samba.org>
Date: Mon, 3 Sep 2012 23:20:19 +0000 (+1000)
Subject: docs: Remove merged-branches.txt
X-Git-Tag: samba-4.0.0rc1~267
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=3f42619e802b9dc13dc4dd770d419a0e4e9fce9d;p=thirdparty%2Fsamba.git

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
---

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.