anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-12-24 13:48:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

xypic.lyx merge conflict #1

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@28600 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Pavel Sanda 2009-02-25 02:01:46 +00:00
parent aa06732b26
commit 80bbb98588
1 changed files with 6 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
lib/examples/xypic.lyx
View File

@ -2947,13 +2947,13 @@ xymatrixrowsep@
\family sans \family sans
Layout\SpecialChar \menuseparator Layout\SpecialChar \menuseparator
Document\SpecialChar \menuseparator Document\SpecialChar \menuseparator
Preamble) Preamble
\end_layout \family default
):
\begin_inset Newpage pagebreak
\end_inset
\begin_layout LyX-Code
\backslash
makeatletter
\end_layout \end_layout
\begin_layout LyX-Code \begin_layout LyX-Code
@ -2966,28 +2966,10 @@ xyR}[1]{%
\begin_layout LyX-Code \begin_layout LyX-Code
\backslash
makeatletter
\end_layout
\begin_layout LyX-Code
\backslash \backslash
xydef@ xydef@
\backslash \backslash
xymatrixrowsep@{#1} xymatrixrowsep@{#1}}
\end_layout
\begin_layout LyX-Code
\backslash
makeatother
\end_layout
\begin_layout LyX-Code
} % end of
\backslash
xyR
\end_layout \end_layout
\begin_layout LyX-Code \begin_layout LyX-Code