X-Git-Url: https://git.grml.org/?a=blobdiff_plain;f=zsh-lovers.1.txt;h=8f874d742fd28f7320a54fd29aca5397fd533924;hb=b86560c0d68b42c4bc83042cacb9ab572e54c375;hp=01959afdbff83ba2bd83aca339f11e47564a3a38;hpb=cb88940c3d379a97e3a75137e905a92c48c41e4b;p=zsh-lovers.git

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