From b86560c0d68b42c4bc83042cacb9ab572e54c375 Mon Sep 17 00:00:00 2001 From: Michael Prokop Date: Mon, 22 Dec 2008 16:33:18 +0100 Subject: [PATCH] Drop some left over merge crap --- debian/changelog | 6 ++++++ zsh-lovers.1.txt | 6 ------ 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/debian/changelog b/debian/changelog index 8797acf..759d384 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +zsh-lovers (0.8.2) unstable; urgency=low + + * Drop some left over merge crap. + + -- Michael Prokop Mon, 22 Dec 2008 16:32:55 +0100 + zsh-lovers (0.8.1) unstable; urgency=low * Apply patch from Tyler Oderkirk which fixes a typo. diff --git a/zsh-lovers.1.txt b/zsh-lovers.1.txt index 01959af..8f874d7 100644 --- a/zsh-lovers.1.txt +++ b/zsh-lovers.1.txt @@ -703,7 +703,6 @@ Modifiers are a powerful mechanism that let you modify the results returned by parameter, filename and history expansion. See zshexpn(1) for details. ------------------------------------------------------------------------------- -<<<<<<< /home/dope/download/Source/HG-Repos/zsh-lovers/zsh-lovers.1.txt.orig.432616858 # NOTE: Zsh 4.3.4 needed! $ autoload -U age # files modified today @@ -723,12 +722,7 @@ $ autoload -U age # Supply times. $ print *(e-age 2006/10/04:10:15 2006/10/04:10:45-) -# Remove a trailing pathname component, leaving the head. This works like -||||||| /tmp/zsh-lovers.1.txt~base.AvW_ZW -# Remove a trailing pathname component, leaving the head. This works like -======= # Remove a trailing pathname component, leaving the head. This works like ->>>>>>> /tmp/zsh-lovers.1.txt~other.vDaddL # `dirname'. $ echo =ls(:h) /bin -- 2.1.4