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)
commit696b58f5dd8370b7ee0670c7a3e5db10234b41ff
treed66c9f337f5b452ca61d509485d8e56befc146c5
parentd3336684f084f984500dd0893dd01bcfc5be0ab1
Fix conflicts in setup/provision script.
source/setup/provision