Fixed merge issue
This commit is contained in:
parent
92757634bd
commit
8bfce7696a
@ -4,11 +4,8 @@ sh /meta/s/scm/sdf/push-website.sh
|
|||||||
|
|
||||||
mkhomepg -p
|
mkhomepg -p
|
||||||
|
|
||||||
<<<<<<< HEAD
|
|
||||||
chown -R scm:www /meta/www/s/scm
|
chown -R scm:www /meta/www/s/scm
|
||||||
|
|
||||||
=======
|
|
||||||
>>>>>>> 8386881c7a9832182fe279ceb8de1a069561f4df
|
|
||||||
ssh scm@tty.sdf.org ksh /sdf/arpa/ns/s/scm/sdf/cluster-web-to-other.ksh
|
ssh scm@tty.sdf.org ksh /sdf/arpa/ns/s/scm/sdf/cluster-web-to-other.ksh
|
||||||
|
|
||||||
chmod -R 755 /meta/gemini/scm
|
chmod -R 755 /meta/gemini/scm
|
||||||
|
Loading…
Reference in New Issue
Block a user