diff options
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 |