[tor-commits] [webwml/master] ugh -- what have i done. maybe this will fix it.

[arma at torproject.org]

commit d44d2685480f72baef100e68ba0b08765a167860
Author: Roger Dingledine <arma at torproject.org>
Date:   Mon May 4 23:10:57 2015 -0400

    ugh -- what have i done. maybe this will fix it.
---
 press/en/info.wmi |    4 ----
 1 file changed, 4 deletions(-)

diff --git a/press/en/info.wmi b/press/en/info.wmi
index 52968ff..9c9e307 100644
--- a/press/en/info.wmi
+++ b/press/en/info.wmi
@@ -7,12 +7,8 @@
     <h2 class="media">Press Contact</h2>
     <p>
     <b>Tor Press Team</b><br>
-<<<<<<< HEAD
-    execdir at torproject.org<br>
-=======
     press at torproject.org<br>
     +1-617-902-0208
->>>>>>> 5628d54898b63540d5df3179261a9cdd591fd970
     </p>
     </div>
    <!-- END INFOBLOCK -->