resolve conflicts

darcs-hash:20040316020322-5007d-d249c4b1b737ad522ea42337846a7c0d7d2d05c2.gz

diff --git a/doc/nestedvm.ivme04.tex b/doc/nestedvm.ivme04.tex
index 789c774..31d1481 100644 (file)
--- a/doc/nestedvm.ivme04.tex
+++ b/doc/nestedvm.ivme04.tex
@@ -21,11 +21,13 @@ Running Legacy C/C++ Libraries in a Pure Java Environment
 }}}
 \date{}
 \author{\begin{tabular}{@{}c@{}}
-        {\em {Brian Alliet}} \\ \\
-        {{\it RIT}}\relax
+        {\em {Brian Alliet}} \\
+        {Rochester Institute of Technology}\\
+        {\tt brian@ibex.org}
    \end{tabular}\hskip 1in\begin{tabular}{@{}c@{}}
-        {\em {Adam Megacz}} \\ \\
-        {UC Berkeley}\relax
+        {\em {Adam Megacz}} \\
+        {UC Berkeley Statistical Computing Facility} \\
+        {\tt adam@ibex.org}
 \end{tabular}}
 \begin{document}