[tor-commits] [user-manual/master] fixing conflict in downloading.page

[colin@xxxxxxxxxxxxxx]

commit f49285220938a6482c2e142ca067dc92ea735642
Merge: a8f3c53 e140a13
Author: Tommy Collison <tommyc@xxxxxxxxxxxxxx>
Date:   Mon Aug 20 11:10:02 2018 -0700

    fixing conflict in downloading.page

 C/circumvention.page | 2 +-
 C/downloading.page   | 5 ++---
 C/onionsites.page    | 4 ++--
 C/plugins.page       | 5 +++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --cc C/downloading.page
index 5ee7007,3215c90..34507d0
--- a/C/downloading.page
+++ b/C/downloading.page
@@@ -27,8 -27,8 +27,7 @@@ below
  <title>GetTor</title>
   <p>
   GetTor is a service that automatically responds to messages with links
-- to the latest version of Tor Browser, hosted at a  variety of locations,
-  such as Dropbox, Google Drive and GitHub..
 - such as Dropbox, Google Drive and GitHub.
++ to the latest version of Tor Browser, hosted at a  variety of locations, such as Dropbox, Google Drive and GitHub.
   </p>
  
   <p>



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