finalized merge.

FluSightNetwork · May 19, 2018 · 15872cc · 15872cc
1 parent 40ba3b9
commit 15872cc
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/writing/comparison/comparison-manuscript.Rnw b/writing/comparison/comparison-manuscript.Rnw
@@ -36,11 +36,7 @@
 
 \begin{abstract}
 
-<<<<<<< HEAD
 250 word limit
-=======
-TBD. 
->>>>>>> 496a2349e1a44c8e204483064bf42c22a1c2a81b
 
 \end{abstract}