merged emacs buffer conflicts...

This commit is contained in:
Sears Russell 2006-04-23 19:59:55 +00:00
parent 658967cb61
commit 5eb2f4349b

View file

@ -48,9 +48,6 @@
{\rm Russell Sears}\\
UC Berkeley
\and
{\rm Michael Demmer}\\
UC Berkeley
\and
{\rm Eric Brewer}\\
UC Berkeley
} % end author