Changeset 6809 for trunk

Timestamp:

03/10/05 16:18:35 (20 years ago)

Author:

galante

Message:

*** empty log message ***

File:

• trunk/MagicSoft/GRB-Proposal/magic-tdas.sty (modified) (3 diffs)

trunk/MagicSoft/GRB-Proposal/magic-tdas.sty

@@ -61 +61 @@
 \newcommand\TDASref[1]{\gdef\@TDASref{#1}}
 %-----------------------------------------------------------
-%\newcommand{\coauthor}[3]{
-%  \begin{tabular}{lll}%
-%    #1 & #2 & #3
-%  \end{tabular}%
-%}
 \renewcommand\@maketitle{%
   \newpage
@@ -82 +77 @@
         \@author
       \end{tabular}\par}%
+%<<<<<<< magic-tdas.sty
+%=======
 %    \begin{tabular}[!h]{lll}%
 %      Co-I: & Denis Bastieri & Universit\`a degli Studi di Padova\\
@@ -99 +96 @@
     %\coauthor
     %\end{tabular}\par%
+%>>>>>>> 1.4
     \vskip 1em%
     {\large \@date}%