linux/ohmyzsh
1
0
Fork 0
mirror of https://github.com/ohmyzsh/ohmyzsh.git synced 2025-12-26 02:12:33 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

resolved conflicts with upstream

Browse source
This commit is contained in:
MatToufoutu 2010-12-22 16:24:11 +01:00
commit a56eaf8163
2 changed files with 0 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

3
lib/functions.zsh
View file

@ -37,7 +37,6 @@ function take() {
mkdir -p $1 mkdir -p $1
cd $1 cd $1
} }
<<<<<<< HEAD
function logview() { function logview() {
if [ -x $(which ccze) ]; then if [ -x $(which ccze) ]; then
@ -55,5 +54,3 @@ function logtail() {
fi fi
} }
=======
>>>>>>> upstream/master

0
plugins/ssh-agent/ssh_agent.plugin.zsh → plugins/ssh_agent/ssh_agent.plugin.zsh
View file