Fix conflicts in setup/provision script.
authorAndrew Bartlett <abartlet@samba.org>
Wed, 2 Apr 2008 01:31:24 +0000 (12:31 +1100)
committerAndrew Bartlett <abartlet@samba.org>
Wed, 2 Apr 2008 01:31:24 +0000 (12:31 +1100)
commit67bf4bab3ddaf8d1dfaee92007700d8f05a1c191
tree729a5751e83907bd4a2a43f6828de965cebbd3ee
parent4ccb384327d2f1b8c7d1e6ac4806062888154513
Fix conflicts in setup/provision script.
(This used to be commit 696b58f5dd8370b7ee0670c7a3e5db10234b41ff)
source4/setup/provision