From: Pavel Sanda <sanda@lyx.org>
Date: Wed, 25 Feb 2009 02:01:46 +0000 (+0000)
Subject: xypic.lyx merge conflict #1
X-Git-Tag: 2.0.0~7157
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=80bbb985883f8c39117bfafd29c2440e45f01d45;p=features.git

xypic.lyx merge conflict #1


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@28600 a592a061-630c-0410-9148-cb99ea01b6c8
---

diff --git a/lib/examples/xypic.lyx b/lib/examples/xypic.lyx
index 670d815317..57bce5366d 100644
--- a/lib/examples/xypic.lyx
+++ b/lib/examples/xypic.lyx
@@ -2947,13 +2947,13 @@ xymatrixrowsep@
 \family sans
 Layout\SpecialChar \menuseparator
 Document\SpecialChar \menuseparator
-Preamble)
-\end_layout
+Preamble
+\family default
+):
+\begin_inset Newpage pagebreak
+\end_inset
 
-\begin_layout LyX-Code
 
-\backslash
-makeatletter
 \end_layout
 
 \begin_layout LyX-Code
@@ -2966,28 +2966,10 @@ xyR}[1]{%
 
 \begin_layout LyX-Code
 
-\backslash
-makeatletter
-\end_layout
-
-\begin_layout LyX-Code
-
 \backslash
 xydef@
 \backslash
-xymatrixrowsep@{#1}
-\end_layout
-
-\begin_layout LyX-Code
-
-\backslash
-makeatother
-\end_layout
-
-\begin_layout LyX-Code
-} % end of 
-\backslash
-xyR
+xymatrixrowsep@{#1}}
 \end_layout
 
 \begin_layout LyX-Code