Fix merge conflict (pre-PR merge)

This commit is contained in:
AVAtarMod 2023-08-22 14:39:42 +03:00
parent 1285da87e5
commit 6dce1980d7
Signed by: stud128245
GPG Key ID: 43198AE4D0774328

View File

@ -20,6 +20,7 @@
\usepackage{xstring} \usepackage{xstring}
\usepackage{tabularx} \usepackage{tabularx}
\usepackage{enumitem} \usepackage{enumitem}
\usepackage{mathtools}
\usepackage[strict=true]{csquotes} \usepackage[strict=true]{csquotes}
\usepackage[abspath]{currfile} \usepackage[abspath]{currfile}
\usepackage[hidelinks,linktoc=all]{hyperref} \usepackage[hidelinks,linktoc=all]{hyperref}
@ -179,9 +180,6 @@
\urlstyle{same} \urlstyle{same}
% ОФОРМЛЕНИЕ ТЕКСТА % ОФОРМЛЕНИЕ ТЕКСТА
\renewcommand{\baselinestretch}{1.5}
\MakeOuterQuote{"}
\makeatletter \makeatletter
\DeclareRobustCommand\vdots{% \DeclareRobustCommand\vdots{%
\mathpalette\@vdots{}% \mathpalette\@vdots{}%
@ -237,3 +235,6 @@
}% }%
} }
\makeatother \makeatother
\renewcommand{\baselinestretch}{1.5}
\MakeOuterQuote{"}