[tor-commits] [tor/master] Remove merge-conflict detritus

[nickm at torproject.org]

commit 8e5450b7524798467479ebe2aef0f7081a74ea48
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Dec 20 10:15:00 2017 -0500

    Remove merge-conflict detritus
---
 scripts/maint/updateFallbackDirs.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/scripts/maint/updateFallbackDirs.py b/scripts/maint/updateFallbackDirs.py
index 4d00c0fac..3efd408ec 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