nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-24 04:13:28 +01:00
Code Issues Packages Projects Releases Wiki Activity

Remove merge-conflict detritus

Browse Source
This commit is contained in:
Nick Mathewson 2017-12-20 10:15:00 -05:00
parent f92b533757
commit 8e5450b752
1 changed files with 0 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
scripts/maint/updateFallbackDirs.py
View File

@ -1,7 +1,6 @@
#!/usr/bin/python
# Usage:
<<<<<<< Updated upstream
#
# Regenerate the list:
# scripts/maint/updateFallbackDirs.py > src/or/fallback_dirs.inc 2> fallback_dirs.log