summaryrefslogtreecommitdiff
path: root/source4/script
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2008-04-02 12:31:24 +1100
committerAndrew Bartlett <abartlet@samba.org>2008-04-02 12:31:24 +1100
commit67bf4bab3ddaf8d1dfaee92007700d8f05a1c191 (patch)
tree729a5751e83907bd4a2a43f6828de965cebbd3ee /source4/script
parent4ccb384327d2f1b8c7d1e6ac4806062888154513 (diff)
downloadsamba-67bf4bab3ddaf8d1dfaee92007700d8f05a1c191.tar.gz
samba-67bf4bab3ddaf8d1dfaee92007700d8f05a1c191.tar.bz2
samba-67bf4bab3ddaf8d1dfaee92007700d8f05a1c191.zip
Fix conflicts in setup/provision script.
(This used to be commit 696b58f5dd8370b7ee0670c7a3e5db10234b41ff)
Diffstat (limited to 'source4/script')
0 files changed, 0 insertions, 0 deletions