merged emacs buffer conflicts...
This commit is contained in:
parent
658967cb61
commit
5eb2f4349b
1 changed files with 0 additions and 3 deletions
|
@ -48,9 +48,6 @@
|
|||
{\rm Russell Sears}\\
|
||||
UC Berkeley
|
||||
\and
|
||||
{\rm Michael Demmer}\\
|
||||
UC Berkeley
|
||||
\and
|
||||
{\rm Eric Brewer}\\
|
||||
UC Berkeley
|
||||
} % end author
|
||||
|
|
Loading…
Reference in a new issue