[tor-commits] [webwml/master] Update contact details

[hiro at torproject.org]

commit 1cd1d458f26521b93642f7d9084b8fa424fced9a
Author: hiro <hiro at torproject.org>
Date:   Wed Dec 19 09:51:56 2018 +0100

    Update contact details
---
 about/en/contact.wml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/about/en/contact.wml b/about/en/contact.wml
index 82beb88b..8dbd42c7 100644
--- a/about/en/contact.wml
+++ b/about/en/contact.wml
@@ -157,8 +157,13 @@ sub   4096R/C00942E4 2017-03-13
     <h3><a class="anchor" href="#mail">Mailing Address</a></h3>
     <p>Should you need to reach us via old-fashioned mail, our mailing
     address is:</p>
+<<<<<<< HEAD
 <address>The Tor Project<br>
 217 First Ave South #4903<br>
+=======
+<address>The Tor Project, Inc.<br>
+P.O. Box 4903<br>
+>>>>>>> Update contact details
 Seattle, WA 98194 USA<br><br>
 </address>