Index: trunk/MagicSoft/GRB-Proposal/magic-tdas.sty
===================================================================
--- trunk/MagicSoft/GRB-Proposal/magic-tdas.sty	(revision 6808)
+++ trunk/MagicSoft/GRB-Proposal/magic-tdas.sty	(revision 6809)
@@ -61,9 +61,4 @@
 \newcommand\TDASref[1]{\gdef\@TDASref{#1}}
 %-----------------------------------------------------------
-%\newcommand{\coauthor}[3]{
-%  \begin{tabular}{lll}%
-%    #1 & #2 & #3
-%  \end{tabular}%
-%}
 \renewcommand\@maketitle{%
   \newpage
@@ -82,4 +77,6 @@
         \@author
       \end{tabular}\par}%
+%<<<<<<< magic-tdas.sty
+%=======
 %    \begin{tabular}[!h]{lll}%
 %      Co-I: & Denis Bastieri & Universit\`a degli Studi di Padova\\
@@ -99,4 +96,5 @@
     %\coauthor
     %\end{tabular}\par%
+%>>>>>>> 1.4
     \vskip 1em%
     {\large \@date}%