Mirrors/ctf-tools
2
0
Fork 0
mirror of https://github.com/zardus/ctf-tools synced 2024-12-14 15:02:33 +00:00
Code Issues Projects Releases Packages Wiki Activity

manage-tools script contained some git merge artifacts, which broke the script

Browse source
This commit is contained in:
Michael Rodler 2016-06-01 13:55:49 +02:00
parent ab6c90eaab
commit 6dd094a8a9
1 changed files with 1 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
bin/manage-tools
View file

@ -162,14 +162,10 @@ case $ACTION in
base_build_setup "$DISTRI" base_build_setup "$DISTRI"
<<<<<<< HEAD
echo "PATH=\"$PWD/bin:\$PATH\"" >> ~/.bashrc echo "PATH=\"$PWD/bin:\$PATH\"" >> ~/.bashrc
if [ -e ~/.zshrc ] if [ -e ~/.zshrc ]
then then
=======
if [ -e ~/.zshrc ]
then
>>>>>>> 82571b6917b6dbb212e722d35c6f7d2d99b7e0cb
echo "PATH=\"$PWD/bin:\$PATH\"" >> ~/.zshrc echo "PATH=\"$PWD/bin:\$PATH\"" >> ~/.zshrc
fi fi