Merge branch 'master' of 76.182.74.61:stonewareslord/Sync

i don't know how this happened
This commit is contained in:
Austen Adler 2014-05-06 16:51:21 -04:00
commit 5fa5805715

View File

@ -8,7 +8,7 @@ mkdir a
mkdir b mkdir b
cd /tmp/tests/a cd /tmp/tests/a
git init git init
git remote add origin git@76.182.74.61:hitchhikers/MyRobot.git git remote add origin git@76.182.74.61:hitchhikers/Zaphod.git
echo -e "${green}SSH cloning${close}" echo -e "${green}SSH cloning${close}"
git pull origin master git pull origin master
echo -e "${green}" echo -e "${green}"
@ -16,7 +16,7 @@ ls
echo -e "${close}" echo -e "${close}"
cd /tmp/tests/b cd /tmp/tests/b
git init git init
git remote add origin https://76.182.74.61/gitlab/hitchhikers/MyRobot.git git remote add origin https://76.182.74.61/gitlab/hitchhikers/Zaphod.git
git config http.sslVerify false git config http.sslVerify false
echo -e "${green}HTTPS cloning${close}" echo -e "${green}HTTPS cloning${close}"
git pull origin master git pull origin master