From 15872cc05ffa7547a7d183a1878c738aa7664fab Mon Sep 17 00:00:00 2001
From: Nicholas Reich <nick@schoolph.umass.edu>
Date: Sat, 19 May 2018 14:29:29 -0400
Subject: [PATCH] finalized merge.

---
 writing/comparison/comparison-manuscript.Rnw | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/writing/comparison/comparison-manuscript.Rnw b/writing/comparison/comparison-manuscript.Rnw
index 04028f60..349d7624 100644
--- 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}