[tor-commits] [webwml/master] Fix another tiny merge conflict

[hiro@xxxxxxxxxxxxxx]

commit dbab665f34b513955659406da3c5bd31ac6564dc
Author: hiro <hiro@xxxxxxxxxxxxxx>
Date:   Fri Aug 10 19:12:38 2018 +0200

    Fix another tiny merge conflict
---
 press/en/press.wml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/press/en/press.wml b/press/en/press.wml
index 6a259c12..70cf25ee 100644
--- a/press/en/press.wml
+++ b/press/en/press.wml
@@ -81,7 +81,6 @@ took a huge step towards controlling all access to the Internet</a></td>
 </tr>
 
 <tr style="background-color: #e5e5e5;">
->>>>>>> ea87dd7c810e074e6f5c3bd659ff9f58d45da108
 <td>2018 May 30</td>
 <td>ZDNet</td>
 <td><a href="https://www.zdnet.com/article/technology-that-changed-us-the-2000s/";>Technology that changed us: The 2000s, from iPhone to Twitter</a></td>

_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits