summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoromega <marco.biasco@gmail.com>2009-04-25 22:36:23 +0200
committeromega <marco.biasco@gmail.com>2009-04-25 22:36:23 +0200
commit6f72fb5f0212e2bf1bf896acde41fd8adadbc0e1 (patch)
tree345124d8c68963edd3d364cf2084cc00c73cde36
parentddac755a1b7fbecf95e6ee1e927ea0b802221b08 (diff)
downloadscripts-6f72fb5f0212e2bf1bf896acde41fd8adadbc0e1.tar.gz
scripts-6f72fb5f0212e2bf1bf896acde41fd8adadbc0e1.tar.bz2
Fixed again
-rwxr-xr-xgit-compiz4
1 files changed, 0 insertions, 4 deletions
diff --git a/git-compiz b/git-compiz
index 964ba9f..06609b0 100755
--- a/git-compiz
+++ b/git-compiz
@@ -436,11 +436,7 @@ else
printinfo info "${INFO_DOWNLOAD//%s/$b}";
logcmd echo
if (echo $1 | grep -q '%writeto%'); then
-<<<<<<< HEAD:git-compiz
wget -O $REALNAME -nv `echo $1 | sed 's|%writeto%.*||'`
-=======
- wget -O `echo $1 | sed 's|.*%writeto%||'` -nv `echo $1 | sed 's|%writeto%.*||'`
->>>>>>> 4f676be8c9509b296ba09181b6daf3aea4ed8f39:git-compiz
else
wget -nv $1
fi