summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Code/configure.py1
1 files changed, 0 insertions, 1 deletions
diff --git a/Code/configure.py b/Code/configure.py
index 148bcd5..5c89cae 100644
--- a/Code/configure.py
+++ b/Code/configure.py
@@ -54,4 +54,3 @@ SQLITE_EDGE_FILE = '../Data/temp/edges.sqlite'
DIFF_EDGE_FILE = '../Data/temp/edges-diff.txt' # the difference between two edge files from yesterday and from today
TARGET_TF_FILE = '../Data/information/target_tf.txt'
->>>>>>> 837a291e6a1816920c7116410dd1e0df9fd3eaf7