From 8c411c2134f9952d559d619a85a3173fcfe00659 Mon Sep 17 00:00:00 2001
From: Pavel Sanda <sanda@lyx.org>
Date: Wed, 25 Feb 2009 02:07:14 +0000
Subject: [PATCH] xypic.lyx merge conflict #2

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@28601 a592a061-630c-0410-9148-cb99ea01b6c8
---
 lib/examples/xypic.lyx | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/lib/examples/xypic.lyx b/lib/examples/xypic.lyx
index 57bce5366d..ca1cf7e4d7 100644
--- a/lib/examples/xypic.lyx
+++ b/lib/examples/xypic.lyx
@@ -7,18 +7,12 @@
 \usepackage[all]{xy}
 
 
-\makeatletter
+% define new commands used in sec. 5.1
 \newcommand{\xyR}[1]{
   \makeatletter
-  \xydef@\xymatrixrowsep@{#1}
-  \makeatother
-}
-\makeatletter
+  \xydef@\xymatrixrowsep@{#1}}
 \newcommand{\xyC}[1]{
-  \makeatletter
-  \xydef@\xymatrixcolsep@{#1}
-  \makeatother
-}
+  \xydef@\xymatrixcolsep@{#1}}
 
 \newdir{|>}{!/4.5pt/@{|}*:(1,-.2)@^{>}*:(1,+.2)@_{>}}
 
-- 
2.39.5