From: Nick Mathewson <nickm@torproject.org>
Date: Wed, 20 Dec 2017 15:15:00 +0000 (-0500)
Subject: Remove merge-conflict detritus
X-Git-Tag: tor-0.3.3.1-alpha~106
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8e5450b7524798467479ebe2aef0f7081a74ea48;p=thirdparty%2Ftor.git

Remove merge-conflict detritus
---

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