Remove merge-conflict detritus

diff --git a/scripts/maint/updateFallbackDirs.py b/scripts/maint/updateFallbackDirs.py
index 4d00c0facfe137490639aa4e7a47670d97b5f706..3efd408ec73ddefdb726200b831b406e95ff99b0 100755 (executable)
--- 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