Permalink
Browse files

fixed conflict.

  • Loading branch information...
1 parent c6765ed commit c44ec23f843c9d7b29e23ca98cdcd390efd1eddd @uberj committed Feb 23, 2012
Showing with 0 additions and 9 deletions.
  1. +0 −9 Proposal/Draft2/sample.tex
@@ -112,13 +112,8 @@ \subsection*{White Papers}
\citeauthor*{Bauer}: This paper discusses the consequences of replacing the Round Robin algorithm and
proposes a new scheduling algorithm.
\item
-<<<<<<< HEAD
\citeauthor*{Edman}: This paper explores modifying Tor's path selection algorithm to help
clients avoid observers from discovering their identities.
-=======
- \citeauthor*{Edman}: This paper explores modifications to Tor's path selection algorithm to help
- clients prevent observers from discovering their identities.
->>>>>>> e3f8fdafa3efb1fd57179bfd965cfcbe8b708aa3
\item
\citeauthor*{Moore}: This paper describes a different idea of how to improve latency. The
authors propose that traffic should be throttled at the ingress of the network.
@@ -140,10 +135,6 @@ \subsection*{White Papers}
\newpage
\bibliographystyle{mla-good}
-<<<<<<< HEAD
-%\bibliographystyle{plain-annote}
-=======
\center \renewcommand\refname{Work Cited\\ }
->>>>>>> e3f8fdafa3efb1fd57179bfd965cfcbe8b708aa3
\bibliography{sample}
\end{document}

0 comments on commit c44ec23

Please sign in to comment.