Remove merge-conflict detritus

2017-12-20 10:15:00 -05:00 · 2017-12-20 10:15:00 -05:00 · 8e5450b752
parent f92b533757
commit 8e5450b752
1 changed files with 0 additions and 1 deletions
--- 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