[tor-commits] [webwml/staging] Fix merge conflicts

[hiro at torproject.org]

commit 94f70b4b9846c0a81b13c966b353295114a4aa2f
Merge: be786f13 c51c7f2c
Author: hiro <hiro at torproject.org>
Date:   Mon Aug 27 13:08:02 2018 +0200

    Fix merge conflicts

 docs/debian-selector.js       |   5 +
 download/en/download-easy.wml | 111 +------------------
 download/en/download-unix.wml |  18 +++-
 download/en/download.wml      | 173 +++++-------------------------
 download/en/tor.wml           | 241 ++++++++++++++++++++++++++++++++++++++++++
 en/index.wml                  |   2 +-
 images/distros/slackware.png  | Bin 0 -> 19882 bytes
 include/versions.wmi          |  13 ++-
 include/warning.wmi           | 132 +++++++++++++++++++++++
 projects/en/projects.wml      |   9 +-
 10 files changed, 440 insertions(+), 264 deletions(-)