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 670d8153179f36ab16a2ea4712790f2fe21dab45..57bce5366db6fb71b2337ef6e9707974ee9f00b4 100644 (file)
--- 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