diff options
| author | Nick Mathewson <nickm@torproject.org> | 2017-12-20 10:15:00 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2017-12-20 10:15:00 -0500 |
| commit | 8e5450b7524798467479ebe2aef0f7081a74ea48 (patch) | |
| tree | e2798be71de577df878ae8ddcdcef2bbacb17f53 /scripts | |
| parent | f92b5337573bcc5bf94cd034c033c11db4eca811 (diff) | |
| download | tor-8e5450b7524798467479ebe2aef0f7081a74ea48.tar.gz tor-8e5450b7524798467479ebe2aef0f7081a74ea48.zip | |
Remove merge-conflict detritus
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/maint/updateFallbackDirs.py | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/scripts/maint/updateFallbackDirs.py b/scripts/maint/updateFallbackDirs.py index 4d00c0facf..3efd408ec7 100755 --- a/scripts/maint/updateFallbackDirs.py +++ b/scripts/maint/updateFallbackDirs.py @@ -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 |