diff options
| -rw-r--r-- | merged-branches.txt | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/merged-branches.txt b/merged-branches.txt deleted file mode 100644 index 064203f672..0000000000 --- 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. |