docs: Remove merged-branches.txt
commit3f42619e802b9dc13dc4dd770d419a0e4e9fce9d
authorAndrew Bartlett <abartlet@samba.org>
Mon, 3 Sep 2012 23:20:19 +0000 (4 09:20 +1000)
committerAndrew Bartlett <abartlet@samba.org>
Mon, 3 Sep 2012 23:31:49 +0000 (4 09:31 +1000)
tree1673be7fbed7ccd01e87e8eb4ceb178bd9ac82f0
parent00108282d046c2d4948c7c5977c98b412e08fb0a
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 [deleted file]